Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2fc982c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11186783 from 0fa75c4e to 24Q1-release 

Change-Id: I35961690e48bac1513a50de58435577b68ad04bb
parents b15970aa 0fa75c4e

res/values/strings.xml

+7 −3
Original line number Diff line number Diff line
@@ -4609,7 +4609,7 @@ 
    <string name="accessibility_screen_magnification_navbar_short_summary">Tap a button to zoom</string>

    <!-- Intro for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_intro_text">Quickly zoom in on the screen to make content larger</string>

    <!-- Summary for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->

    <!-- Instructions on the accessibility preference screen teaching the user how to enable screen magnification gestures. [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_summary">

        <![CDATA[

        <b>To zoom in:</b><br/>
@@ -4786,6 +4786,10 @@ 
    <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>

    <!-- Summary for the accessibility preference for enabling/disabling large icons for mouse/trackpad pointers. [CHAR LIMIT=60] -->

    <string name="accessibility_toggle_large_pointer_icon_summary">Make the mouse pointer more noticeable</string>

    <!-- Title for the accessibility preference for forcing all apps to use dark theme. [CHAR LIMIT=35] -->

    <string name="accessibility_force_invert_title">Make all apps dark</string>

    <!-- Summary for the accessibility preference for forcing all apps to use dark theme. [CHAR LIMIT=100] -->

    <string name="accessibility_force_invert_summary">Applies to apps without their own dark theme. Some apps may have display issues, like inverted colors.</string>

    <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->

    <string name="accessibility_disable_animations">Remove animations</string>

    <!-- Summary for the accessibility preference for disabling animations. [CHAR LIMIT=60] -->
@@ -12558,8 +12562,8 @@ 
    <string name="color_inversion_state_off">Off</string>

    <!-- The color inversion feature summary displayed as a subtext as an item in a list. -->

    <string name="color_inversion_feature_summary">Turns light screens dark and dark screens light</string>

    <!-- Short summary explains what magnification feature is. -->

    <string name="magnification_feature_summary">Quickly zoom in on the screen to make content larger</string>

    <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->

    <string name="magnification_feature_summary">Zoom in on the screen</string>

    <!-- Summary of the AutoClick feature disabled state. -->

    <string name="autoclick_disabled">Off</string>

    <!-- Summary of the show captions preference disabled state. -->

res/xml/accessibility_color_and_motion.xml

+8 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ 
        settings:controller="com.android.settings.display.DarkUIPreferenceController"

        settings:searchable="false"/>



    <SwitchPreferenceCompat

        android:icon="@drawable/ic_dark_ui"

        android:key="toggle_force_invert"

        android:persistent="false"

        android:summary="@string/accessibility_force_invert_summary"

        android:title="@string/accessibility_force_invert_title"

        settings:controller="com.android.settings.accessibility.ToggleForceInvertPreferenceController"/>



    <SwitchPreferenceCompat

        android:icon="@drawable/ic_accessibility_animation"

        android:key="toggle_disable_animations"

res/xml/bluetooth_audio_streams.xml

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


    <com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryPreference

        android:key="audio_streams_nearby_category"

        android:title="@string/audio_streams_pref_title" />

        android:title="@string/audio_streams_pref_title"

        settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController" />



</PreferenceScreen>
 
 No newline at end of file

src/com/android/settings/accessibility/ColorAndMotionFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ import android.hardware.display.ColorDisplayManager; 
import android.os.Bundle;

import android.os.Handler;

import android.provider.Settings;

import android.view.accessibility.Flags;



import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.TwoStatePreference;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -47,6 +49,8 @@ public class ColorAndMotionFragment extends DashboardFragment { 
    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference";

    private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";

    private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";

    @VisibleForTesting

    static final String TOGGLE_FORCE_INVERT = "toggle_force_invert";



    private Preference mDisplayDaltonizerPreferenceScreen;

    private TwoStatePreference mToggleDisableAnimationsPreference;
@@ -70,6 +74,9 @@ public class ColorAndMotionFragment extends DashboardFragment { 
        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);

        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);

        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);

        if (Flags.forceInvertColor()) {

            mShortcutFeatureKeys.add(ToggleForceInvertPreferenceController.SETTINGS_KEY);

        }



        mSettingsContentObserver = new AccessibilitySettingsContentObserver(new Handler());

        mSettingsContentObserver.registerKeysToObserverCallback(mShortcutFeatureKeys,

src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends 
    @Override

    void onDialogButtonFromShortcutToggleClicked(View view) {

        super.onDialogButtonFromShortcutToggleClicked(view);

        if (!android.view.accessibility.Flags.deduplicateAccessibilityWarningDialog()) {

        if (!android.view.accessibility.Flags.cleanupAccessibilityWarningDialog()) {

            if (view.getId() == R.id.permission_enable_allow_button) {

                AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName,

                        true);
@@ -80,7 +80,7 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends 
    @Override

    void onAllowButtonFromShortcutToggleClicked() {

        super.onAllowButtonFromShortcutToggleClicked();

        if (android.view.accessibility.Flags.deduplicateAccessibilityWarningDialog()) {

        if (android.view.accessibility.Flags.cleanupAccessibilityWarningDialog()) {

            AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, true);

        }

    }