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

Refactor ToggleAutoclickPreferenceFragment to improve maintainability

Browse Source 
Root cause: There is a bunch of different logic of preferences in ToggleAutoclickPreferenceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out logic of ToggleAutoclickPreferenceFragment 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: I5db18d5a0c577ad67d15c2d0169a36a67e9f13db
This commit is contained in:
menghanli
2022-07-21 11:22:30 +08:00
parent 6544dee983
commit cb008ccf17
11 changed files with 486 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/com/android/settings/accessibility/ToggleAutoclickCustomSeekbarController.java
View File

@@ -18,8 +18,11 @@ package com.android.settings.accessibility;
import static android.content.Context.MODE_PRIVATE;
import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.KEY_DELAY_MODE;
import static com.android.settings.accessibility.ToggleAutoclickPreferenceFragment.Quantity;
import static com.android.settings.accessibility.AutoclickUtils.AUTOCLICK_DELAY_STEP;
import static com.android.settings.accessibility.AutoclickUtils.KEY_CUSTOM_DELAY_VALUE;
import static com.android.settings.accessibility.AutoclickUtils.KEY_DELAY_MODE;
import static com.android.settings.accessibility.AutoclickUtils.MAX_AUTOCLICK_DELAY_MS;
import static com.android.settings.accessibility.AutoclickUtils.MIN_AUTOCLICK_DELAY_MS;
import android.content.ContentResolver;
import android.content.Context;
@@ -35,36 +38,16 @@ 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.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.LayoutPreference;
/**
* Controller class that controls accessibility autoclick seekbar settings.
*/
/** Controller class that controls accessibility autoclick seekbar settings. */
public class ToggleAutoclickCustomSeekbarController extends BasePreferenceController
implements LifecycleObserver, OnResume, OnPause,
implements LifecycleObserver, OnStart, OnStop,
SharedPreferences.OnSharedPreferenceChangeListener {
private static final String CONTROL_AUTOCLICK_DELAY_SECURE =
Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY;
@VisibleForTesting
static final String KEY_CUSTOM_DELAY_VALUE = "custom_delay_value";
// Min allowed autoclick delay value.
static final int MIN_AUTOCLICK_DELAY_MS = 200;
// Max allowed autoclick delay value.
static final int MAX_AUTOCLICK_DELAY_MS = 1000;
// Allowed autoclick delay values are discrete.
// This is the difference between two allowed values.
@VisibleForTesting
static final int AUTOCLICK_DELAY_STEP = 100;
private final SharedPreferences mSharedPreferences;
private final ContentResolver mContentResolver;
private ImageView mShorter;
@@ -98,29 +81,20 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
mContentResolver = context.getContentResolver();
}
public ToggleAutoclickCustomSeekbarController(Context context, Lifecycle lifecycle,
String preferenceKey) {
this(context, preferenceKey);
if (lifecycle != null) {
lifecycle.addObserver(this);
}
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public void onResume() {
public void onStart() {
if (mSharedPreferences != null) {
mSharedPreferences.registerOnSharedPreferenceChangeListener(this);
}
}
@Override
public void onPause() {
public void onStop() {
if (mSharedPreferences != null) {
mSharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
}
@@ -132,7 +106,7 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
final LayoutPreference preference = screen.findPreference(getPreferenceKey());
if (isAvailable()) {
int delayMillis = getSharedPreferenceForDelayValue();
final int delayMillis = getSharedPreferenceForDelayValue();
// Initialize seek bar preference. Sets seek bar size to the number of possible delay
// values.
mSeekBar = preference.findViewById(R.id.autoclick_delay);
@@ -144,14 +118,10 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
mDelayLabel.setText(delayTimeToString(delayMillis));
mShorter = preference.findViewById(R.id.shorter);
mShorter.setOnClickListener(v -> {
minusDelayByImageView();
});
mShorter.setOnClickListener(v -> minusDelayByImageView());
mLonger = preference.findViewById(R.id.longer);
mLonger.setOnClickListener(v -> {
plusDelayByImageView();
});
mLonger.setOnClickListener(v -> plusDelayByImageView());
}
}
@@ -184,12 +154,9 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
return mSharedPreferences.getInt(KEY_CUSTOM_DELAY_VALUE, delayMillis);
}
private void putSecureInt(String name, int value) {
Settings.Secure.putInt(mContentResolver, name, value);
}
private void updateCustomDelayValue(int delayMillis) {
putSecureInt(CONTROL_AUTOCLICK_DELAY_SECURE, delayMillis);
Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY,
delayMillis);
mSharedPreferences.edit().putInt(KEY_CUSTOM_DELAY_VALUE, delayMillis).apply();
mSeekBar.setProgress(delayToSeekBarProgress(delayMillis));
mDelayLabel.setText(delayTimeToString(delayMillis));
@@ -208,15 +175,8 @@ public class ToggleAutoclickCustomSeekbarController extends BasePreferenceContro
updateCustomDelayValue(delayMillis + AUTOCLICK_DELAY_STEP);
}
}
private CharSequence delayTimeToString(int delayMillis) {
final int quantity = (delayMillis == 1000) ? Quantity.ONE : Quantity.FEW;
final float delaySecond = (float) delayMillis / 1000;
// Only show integer when delay time is 1.
final String decimalFormat = (delaySecond == 1) ? "%.0f" : "%.1f";
return mContext.getResources().getQuantityString(
R.plurals.accessibilty_autoclick_delay_unit_second,
quantity, String.format(decimalFormat, delaySecond));
return AutoclickUtils.getAutoclickDelaySummary(mContext.getResources(),
R.plurals.accessibilty_autoclick_delay_unit_second, delayMillis);
}
}