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

Separate shortcut preference controller form accessibility

Browse Source 
Bug: 135056871
Test: manual, robotests
Change-Id: I1dc61d50f46dfbd9bbd6fa33ecbc03157427d0b1
This commit is contained in:
Mill Chen
2019-07-01 21:21:36 +08:00
parent 78a7facc02
commit 08c4c4aadd
5 changed files with 217 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -99,8 +99,6 @@ public class AccessibilitySettings extends DashboardFragment implements
private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
"select_long_press_timeout_preference";
private static final String ACCESSIBILITY_SHORTCUT_PREFERENCE =
"accessibility_shortcut_preference";
private static final String HEARING_AID_PREFERENCE =
"hearing_aid_preference";
private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
@@ -187,7 +185,6 @@ public class AccessibilitySettings extends DashboardFragment implements
private SwitchPreference mToggleDisableAnimationsPreference;
private ListPreference mSelectLongPressTimeoutPreference;
private Preference mDisplayMagnificationPreferenceScreen;
private Preference mAccessibilityShortcutPreferenceScreen;
private Preference mDisplayDaltonizerPreferenceScreen;
private Preference mHearingAidPreference;
private Preference mLiveCaptionPreference;
@@ -378,9 +375,6 @@ public class AccessibilitySettings extends DashboardFragment implements
// Display color adjustments.
mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
// Accessibility shortcut.
mAccessibilityShortcutPreferenceScreen = findPreference(ACCESSIBILITY_SHORTCUT_PREFERENCE);
// Dark Mode.
mDarkUIModePreference = findPreference(DARK_UI_MODE_PREFERENCE);
mDarkUIPreferenceController = new DarkUIPreferenceController(getContext(),
@@ -606,25 +600,6 @@ public class AccessibilitySettings extends DashboardFragment implements
mHearingAidPreferenceController.updateState(mHearingAidPreference);
mLiveCaptionPreferenceController.updateState(mLiveCaptionPreference);
updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
}
private void updateAccessibilityShortcut(Preference preference) {
if (AccessibilityManager.getInstance(getActivity())
.getInstalledAccessibilityServiceList().isEmpty()) {
mAccessibilityShortcutPreferenceScreen
.setSummary(getString(R.string.accessibility_no_services_installed));
mAccessibilityShortcutPreferenceScreen.setEnabled(false);
} else {
mAccessibilityShortcutPreferenceScreen.setEnabled(true);
boolean shortcutEnabled =
AccessibilityUtils.isShortcutEnabled(getContext(), UserHandle.myUserId());
CharSequence summary = shortcutEnabled
? AccessibilityShortcutPreferenceFragment.getServiceName(getContext())
: getString(R.string.accessibility_feature_state_off);
mAccessibilityShortcutPreferenceScreen.setSummary(summary);
}
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =