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

Merge "Separate a11y timeout preference controller from accessibility"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-26 08:38:11 +00:00
committed by Android (Google) Code Review
parent 20b2f8ab50 223bf1b520
commit d5888bbf84
5 changed files with 135 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
@@ -65,8 +64,6 @@ import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
import com.google.common.primitives.Ints;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -127,8 +124,6 @@ public class AccessibilitySettings extends DashboardFragment implements
"vibration_preference_screen";
private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
"daltonizer_preference";
private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
"accessibility_control_timeout_preference_fragment";
private static final String DARK_UI_MODE_PREFERENCE =
"dark_ui_mode_accessibility";
private static final String LIVE_CAPTION_PREFERENCE_KEY =
@@ -277,7 +272,6 @@ public class AccessibilitySettings extends DashboardFragment implements
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
addPreferencesFromResource(R.xml.accessibility_settings);
initializeAllPreferences();
mDpm = (DevicePolicyManager) (getActivity()
.getSystemService(Context.DEVICE_POLICY_SERVICE));
@@ -754,22 +748,6 @@ public class AccessibilitySettings extends DashboardFragment implements
updateAutoclickSummary(mAutoclickPreferenceScreen);
updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
updateAccessibilityTimeoutSummary(getContentResolver(),
findPreference(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE));
}
void updateAccessibilityTimeoutSummary(ContentResolver resolver, Preference pref) {
String[] timeoutSummarys = getResources().getStringArray(
R.array.accessibility_timeout_summaries);
int[] timeoutValues = getResources().getIntArray(
R.array.accessibility_timeout_selector_values);
int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
resolver, AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
int idx = Ints.indexOf(timeoutValues, timeoutValue);
pref.setSummary(timeoutSummarys[idx == -1 ? 0 : idx]);
}
private void updateFeatureSummary(String prefKey, Preference pref) {

49
src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java Normal file
View File

@@ -0,0 +1,49 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.accessibility;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.primitives.Ints;
public class AccessibilityTimeoutPreferenceController extends BasePreferenceController {
public AccessibilityTimeoutPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public CharSequence getSummary() {
final String[] timeoutSummarys = mContext.getResources().getStringArray(
R.array.accessibility_timeout_summaries);
final int[] timeoutValues = mContext.getResources().getIntArray(
R.array.accessibility_timeout_selector_values);
final int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
mContext.getContentResolver(),
AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
final int idx = Ints.indexOf(timeoutValues, timeoutValue);
return timeoutSummarys[idx == -1 ? 0 : idx];
}
}