PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new reminder in "Magnify with shortcut" page

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

Bug: 134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
This commit is contained in:
Kevin Chang
2019-06-18 15:18:23 +08:00
parent e5584cd39c
commit c375bfde87
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
@@ -132,9 +134,10 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
if (info.getComponentName().equals(assignedComponentName)) {
final CharSequence assignedServiceName = info.getResolveInfo().loadLabel(
context.getPackageManager());
return context.getString(
R.string.accessibility_screen_magnification_navbar_configuration_warning,
assignedServiceName);
final int messageId = isGestureNavigateEnabled(context)
? R.string.accessibility_screen_magnification_gesture_navigation_warning
: 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);
}
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 =
new BaseSearchIndexProvider() {
@Override
@@ -173,4 +182,4 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
return isApplicable(context.getResources());
}
};
}
}