Merge "Move PreferenceControllers to member variables to prevent memory leak" into main
This commit is contained in:
Treehugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
f1cd781ed1
@@ -19,17 +19,21 @@ package com.android.settings.accessibility;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.database.ContentObserver;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
|
||||
import androidx.lifecycle.LifecycleObserver;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.DefaultLifecycleObserver;
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.widget.SelectorWithWidgetPreference;
|
||||
|
||||
import com.google.common.primitives.Ints;
|
||||
@@ -39,41 +43,36 @@ import java.util.Map;
|
||||
|
||||
/** Controller class that control radio button of accessibility daltonizer settings. */
|
||||
public class DaltonizerRadioButtonPreferenceController extends BasePreferenceController implements
|
||||
LifecycleObserver, SelectorWithWidgetPreference.OnClickListener {
|
||||
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
|
||||
DefaultLifecycleObserver, SelectorWithWidgetPreference.OnClickListener {
|
||||
private static final String DALTONIZER_TYPE_SETTINGS_KEY =
|
||||
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
|
||||
|
||||
// pair the preference key and daltonizer value.
|
||||
private final Map<String, Integer> mAccessibilityDaltonizerKeyToValueMap = new HashMap<>();
|
||||
|
||||
// RadioButtonPreference key, each preference represent a daltonizer value.
|
||||
private final ContentResolver mContentResolver;
|
||||
private final ContentObserver mSettingsContentObserver;
|
||||
private final Resources mResources;
|
||||
private DaltonizerRadioButtonPreferenceController.OnChangeListener mOnChangeListener;
|
||||
private SelectorWithWidgetPreference mPreference;
|
||||
private int mAccessibilityDaltonizerValue;
|
||||
|
||||
public DaltonizerRadioButtonPreferenceController(Context context, String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
|
||||
mContentResolver = context.getContentResolver();
|
||||
mResources = context.getResources();
|
||||
mSettingsContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
|
||||
@Override
|
||||
public void onChange(boolean selfChange) {
|
||||
if (mPreference != null) {
|
||||
updateState(mPreference);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public DaltonizerRadioButtonPreferenceController(Context context, Lifecycle lifecycle,
|
||||
String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
|
||||
mContentResolver = context.getContentResolver();
|
||||
mResources = context.getResources();
|
||||
|
||||
if (lifecycle != null) {
|
||||
lifecycle.addObserver(this);
|
||||
}
|
||||
}
|
||||
|
||||
protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver,
|
||||
String name) {
|
||||
final String daltonizerStringValue = Settings.Secure.getString(resolver, name);
|
||||
protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver) {
|
||||
final String daltonizerStringValue = Settings.Secure.getString(
|
||||
resolver, DALTONIZER_TYPE_SETTINGS_KEY);
|
||||
if (daltonizerStringValue == null) {
|
||||
return AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
|
||||
}
|
||||
@@ -82,13 +81,8 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon
|
||||
: daltonizerIntValue;
|
||||
}
|
||||
|
||||
public void setOnChangeListener(
|
||||
DaltonizerRadioButtonPreferenceController.OnChangeListener listener) {
|
||||
mOnChangeListener = listener;
|
||||
}
|
||||
|
||||
private Map<String, Integer> getDaltonizerValueToKeyMap() {
|
||||
if (mAccessibilityDaltonizerKeyToValueMap.size() == 0) {
|
||||
if (mAccessibilityDaltonizerKeyToValueMap.isEmpty()) {
|
||||
|
||||
final String[] daltonizerKeys = mResources.getStringArray(
|
||||
R.array.daltonizer_mode_keys);
|
||||
@@ -104,12 +98,8 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon
|
||||
return mAccessibilityDaltonizerKeyToValueMap;
|
||||
}
|
||||
|
||||
private void putSecureString(String name, String value) {
|
||||
Settings.Secure.putString(mContentResolver, name, value);
|
||||
}
|
||||
|
||||
private void handlePreferenceChange(String value) {
|
||||
putSecureString(TYPE, value);
|
||||
Settings.Secure.putString(mContentResolver, DALTONIZER_TYPE_SETTINGS_KEY, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -124,44 +114,38 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon
|
||||
screen.findPreference(getPreferenceKey());
|
||||
mPreference.setOnClickListener(this);
|
||||
mPreference.setAppendixVisibility(View.GONE);
|
||||
updateState(mPreference);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
|
||||
final int value = getDaltonizerValueToKeyMap().get(mPreferenceKey);
|
||||
handlePreferenceChange(String.valueOf(value));
|
||||
if (mOnChangeListener != null) {
|
||||
mOnChangeListener.onCheckedChanged(mPreference);
|
||||
}
|
||||
}
|
||||
|
||||
private int getAccessibilityDaltonizerValue() {
|
||||
final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver,
|
||||
TYPE);
|
||||
final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver);
|
||||
return daltonizerValue;
|
||||
}
|
||||
|
||||
protected void updatePreferenceCheckedState(int value) {
|
||||
if (mAccessibilityDaltonizerValue == value) {
|
||||
mPreference.setChecked(true);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
super.updateState(preference);
|
||||
mAccessibilityDaltonizerValue = getAccessibilityDaltonizerValue();
|
||||
|
||||
// reset RadioButton
|
||||
mPreference.setChecked(false);
|
||||
final int daltonizerValueInSetting = getAccessibilityDaltonizerValue();
|
||||
final int preferenceValue = getDaltonizerValueToKeyMap().get(mPreference.getKey());
|
||||
updatePreferenceCheckedState(preferenceValue);
|
||||
mPreference.setChecked(preferenceValue == daltonizerValueInSetting);
|
||||
}
|
||||
|
||||
/** Listener interface handles checked event. */
|
||||
public interface OnChangeListener {
|
||||
/** A hook that is called when preference checked. */
|
||||
void onCheckedChanged(Preference preference);
|
||||
@Override
|
||||
public void onResume(@NonNull LifecycleOwner owner) {
|
||||
mContentResolver.registerContentObserver(
|
||||
Settings.Secure.getUriFor(DALTONIZER_TYPE_SETTINGS_KEY),
|
||||
/* notifyForDescendants= */ false,
|
||||
mSettingsContentObserver
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause(@NonNull LifecycleOwner owner) {
|
||||
mContentResolver.unregisterContentObserver(mSettingsContentObserver);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,8 +24,6 @@ import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -33,14 +31,11 @@ import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.widget.SettingsMainSwitchPreference;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.search.SearchIndexable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -48,40 +43,18 @@ import java.util.List;
|
||||
|
||||
/** Settings for daltonizer. */
|
||||
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
|
||||
public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
|
||||
implements DaltonizerRadioButtonPreferenceController.OnChangeListener {
|
||||
public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment {
|
||||
|
||||
private static final String TAG = "ToggleDaltonizerPreferenceFragment";
|
||||
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
|
||||
private static final String KEY_PREVIEW = "daltonizer_preview";
|
||||
@VisibleForTesting
|
||||
static final String KEY_DEUTERANOMALY = "daltonizer_mode_deuteranomaly";
|
||||
@VisibleForTesting
|
||||
static final String KEY_PROTANOMALY = "daltonizer_mode_protanomaly";
|
||||
@VisibleForTesting
|
||||
static final String KEY_TRITANOMEALY = "daltonizer_mode_tritanomaly";
|
||||
@VisibleForTesting
|
||||
static final String KEY_GRAYSCALE = "daltonizer_mode_grayscale";
|
||||
private static final String KEY_DEUTERANOMALY = "daltonizer_mode_deuteranomaly";
|
||||
private static final String KEY_PROTANOMALY = "daltonizer_mode_protanomaly";
|
||||
private static final String KEY_TRITANOMEALY = "daltonizer_mode_tritanomaly";
|
||||
private static final String KEY_GRAYSCALE = "daltonizer_mode_grayscale";
|
||||
@VisibleForTesting
|
||||
static final String KEY_SATURATION = "daltonizer_saturation";
|
||||
|
||||
private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
|
||||
|
||||
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
||||
Lifecycle lifecycle) {
|
||||
if (sControllers.size() == 0) {
|
||||
final Resources resources = context.getResources();
|
||||
final String[] daltonizerKeys = resources.getStringArray(
|
||||
R.array.daltonizer_mode_keys);
|
||||
|
||||
for (String daltonizerKey : daltonizerKeys) {
|
||||
sControllers.add(new DaltonizerRadioButtonPreferenceController(
|
||||
context, lifecycle, daltonizerKey));
|
||||
}
|
||||
}
|
||||
return sControllers;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerKeysToObserverCallback(
|
||||
AccessibilitySettingsContentObserver contentObserver) {
|
||||
@@ -117,13 +90,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCheckedChanged(Preference preference) {
|
||||
for (AbstractPreferenceController controller : sControllers) {
|
||||
controller.updateState(preference);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateFooterPreference() {
|
||||
final String title = getPrefContext()
|
||||
.getString(R.string.accessibility_daltonizer_about_title);
|
||||
@@ -155,21 +121,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
updateSwitchBarToggleSwitch();
|
||||
for (AbstractPreferenceController controller :
|
||||
buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
|
||||
((DaltonizerRadioButtonPreferenceController) controller).setOnChangeListener(this);
|
||||
((DaltonizerRadioButtonPreferenceController) controller).displayPreference(
|
||||
getPreferenceScreen());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
for (AbstractPreferenceController controller :
|
||||
buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
|
||||
((DaltonizerRadioButtonPreferenceController) controller).setOnChangeListener(null);
|
||||
}
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user