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

Commit c375bfde authored by Kevin Chang's avatar Kevin Chang
Browse files

Add new reminder in "Magnify with shortcut" page 

Add new reminder string in "Magnify with shortcut" page when
it's under gesture navigation mode.

Bug: 134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
parent e5584cd3

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -4869,6 +4869,8 @@ 
    <string name="accessibility_tutorial_dialog_button">Got it</string>

    <string name="accessibility_tutorial_dialog_button">Got it</string>

    <!-- Summary text appearing on the accessibility preference screen to enable screen magnification from the nav bar when the feature is enabled, but the accessibility button is not configured correctly for the feature to be used [CHAR LIMIT=none] -->

    <!-- Summary text appearing on the accessibility preference screen to enable screen magnification from the nav bar when the feature is enabled, but the accessibility button is not configured correctly for the feature to be used [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_navbar_configuration_warning">The Accessibility button is set to <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. To use magnification, touch &amp; hold the Accessibility button, then select magnification.</string>

    <string name="accessibility_screen_magnification_navbar_configuration_warning">The Accessibility button is set to <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. To use magnification, touch &amp; hold the Accessibility button, then select magnification.</string>

    <!-- Summary text appearing on the accessibility preference screen to enable screen magnification from the nav bar when the feature is enabled, but the accessibility button is not configured correctly for the feature to be used [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_gesture_navigation_warning">The accessibility gesture is set to the <xliff:g id="service" example="Select to Speak">%1$s</xliff:g>. To use magnification, swipe up with two fingers from the bottom of the screen and hold. Then select magnification.</string>

    <!-- Title for the preference to configure the accessibility shortcut, which uses the volume keys. [CHAR LIMIT=35] -->

    <!-- Title for the preference to configure the accessibility shortcut, which uses the volume keys. [CHAR LIMIT=35] -->

    <string name="accessibility_global_gesture_preference_title">Volume key shortcut</string>

    <string name="accessibility_global_gesture_preference_title">Volume key shortcut</string>

    <!-- Title for the preference to choose the service that is turned on and off by the accessibility shortcut. [CHAR LIMIT=35] -->

    <!-- Title for the preference to choose the service that is turned on and off by the accessibility shortcut. [CHAR LIMIT=35] -->

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

+13 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.settings.accessibility;

package com.android.settings.accessibility;





import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.accessibilityservice.AccessibilityServiceInfo;

import android.app.settings.SettingsEnums;

import android.app.settings.SettingsEnums;

import android.content.ComponentName;

import android.content.ComponentName;
@@ -132,9 +134,10 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { 
                if (info.getComponentName().equals(assignedComponentName)) {

                if (info.getComponentName().equals(assignedComponentName)) {

                    final CharSequence assignedServiceName = info.getResolveInfo().loadLabel(

                    final CharSequence assignedServiceName = info.getResolveInfo().loadLabel(

                            context.getPackageManager());

                            context.getPackageManager());

                    return context.getString(

                    final int messageId = isGestureNavigateEnabled(context)

                            R.string.accessibility_screen_magnification_navbar_configuration_warning,

                            ? R.string.accessibility_screen_magnification_gesture_navigation_warning

                            assignedServiceName);

                            : R.string.accessibility_screen_magnification_navbar_configuration_warning;

                    return context.getString(messageId, assignedServiceName);

                }

                }

            }

            }

        }

        }
@@ -158,6 +161,12 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { 
        return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);

        return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);

    }

    }





    private static boolean isGestureNavigateEnabled(Context context) {

        return context.getResources().getInteger(

                com.android.internal.R.integer.config_navBarInteractionMode)

                == NAV_BAR_MODE_GESTURAL;

    }



    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

            new BaseSearchIndexProvider() {

                @Override

                @Override