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

Refactor AccessibilityControlTimeoutPreferenceFragment to improve maintainability

Browse Source 
Root cause: There is a bunch of different logic of preferences in AccessibilityControlTimeoutPreferenceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out logic of AccessibilityControlTimeoutPreferenceFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I22e6e3b9e2f199ac1721fc069690321ad5f7a0d4
This commit is contained in:
menghanli
2022-07-15 12:31:38 +08:00
parent 95c771c02f
commit 236a376211
9 changed files with 334 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/accessibility/AccessibilityTimeoutPreferenceController.java
View File

@@ -16,17 +16,25 @@
package com.android.settings.accessibility;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.google.common.primitives.Ints;
/** Preference controller for accessibility timeout. */
public class AccessibilityTimeoutPreferenceController extends BasePreferenceController {
private final ContentResolver mContentResolver;
private final Resources mResources;
public AccessibilityTimeoutPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mContentResolver = mContext.getContentResolver();
mResources = mContext.getResources();
}
@Override
@@ -36,14 +44,13 @@ public class AccessibilityTimeoutPreferenceController extends BasePreferenceCont
@Override
public CharSequence getSummary() {
final String[] timeoutSummarys = mContext.getResources().getStringArray(
final String[] timeoutSummaries = mResources.getStringArray(
R.array.accessibility_timeout_summaries);
final int[] timeoutValues = mContext.getResources().getIntArray(
final int[] timeoutValues = mResources.getIntArray(
R.array.accessibility_timeout_selector_values);
final int timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
mContext.getContentResolver(),
AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
final int timeoutValue = AccessibilityTimeoutUtils.getSecureAccessibilityTimeoutValue(
mContentResolver);
final int idx = Ints.indexOf(timeoutValues, timeoutValue);
return timeoutSummarys[idx == -1 ? 0 : idx];
return timeoutSummaries[idx == -1 ? 0 : idx];
}
}