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

Add progressive disclsoure

Browse Source 
- Add a ProgressiveDisclosureMixin that contains all logic for collapse
  preference list when it's too long
- Refactored PreferenceController's updateState to take a preference
  instead of PreferenceScreen, because with progressive disclosure the
  preference can either be in screen or the mixin. DashboardFragment is
  responsible finding the preference before passing it to controller.

Bug: 32255863
Test: RunSettingsRoboTests

Change-Id: I6713abd61c954ce12732902e5b3ca4d4c0b1563e
This commit is contained in:
Fan Zhang
2016-10-18 12:58:31 -07:00
parent a5c421083a
commit db1112a221
34 changed files with 524 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/display/AutoBrightnessPreferenceController.java
View File

@@ -17,7 +17,6 @@ import android.content.Context;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
@@ -42,7 +41,7 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_AUTO_BRIGHTNESS;
}
@@ -52,15 +51,10 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
}
@Override
public void updateState(PreferenceScreen screen) {
final SwitchPreference preference =
(SwitchPreference) screen.findPreference(KEY_AUTO_BRIGHTNESS);
if (preference == null) {
return;
}
public void updateState(Preference preference) {
int brightnessMode = Settings.System.getInt(mContext.getContentResolver(),
SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
preference.setChecked(brightnessMode != SCREEN_BRIGHTNESS_MODE_MANUAL);
((SwitchPreference) preference).setChecked(brightnessMode != SCREEN_BRIGHTNESS_MODE_MANUAL);
}
@Override

9
src/com/android/settings/display/AutoRotatePreferenceController.java
View File

@@ -17,7 +17,6 @@ import android.content.Context;
import android.content.res.Configuration;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.MetricsProto;
import com.android.internal.view.RotationPolicy;
@@ -38,14 +37,13 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_AUTO_ROTATE;
}
@Override
public void updateState(PreferenceScreen screen) {
final DropDownPreference rotatePreference =
(DropDownPreference) screen.findPreference(KEY_AUTO_ROTATE);
public void updateState(Preference preference) {
final DropDownPreference rotatePreference = (DropDownPreference) preference;
final int rotateLockedResourceId;
// The following block sets the string used when rotation is locked.
// If the device locks specifically to portrait or landscape (rather than current
@@ -69,7 +67,6 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
1 : 0);
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;

15
src/com/android/settings/display/CameraGesturePreferenceController.java
View File

@@ -18,7 +18,6 @@ import android.os.SystemProperties;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
@@ -34,7 +33,7 @@ public class CameraGesturePreferenceController extends PreferenceController impl
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_CAMERA_GESTURE;
}
@@ -44,14 +43,10 @@ public class CameraGesturePreferenceController extends PreferenceController impl
}
@Override
public void updateState(PreferenceScreen screen) {
final SwitchPreference preference =
(SwitchPreference) screen.findPreference(KEY_CAMERA_GESTURE);
if (preference != null) {
int value = Settings.Secure.getInt(mContext.getContentResolver(),
CAMERA_GESTURE_DISABLED, 0);
preference.setChecked(value == 0);
}
public void updateState(Preference preference) {
int value = Settings.Secure.getInt(mContext.getContentResolver(),
CAMERA_GESTURE_DISABLED, 0);
((SwitchPreference) preference).setChecked(value == 0);
}
@Override

13
src/com/android/settings/display/DozePreferenceController.java
View File

@@ -19,7 +19,6 @@ import android.os.SystemProperties;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.core.PreferenceController;
@@ -42,7 +41,7 @@ public class DozePreferenceController extends PreferenceController implements
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_DOZE;
}
@@ -55,13 +54,9 @@ public class DozePreferenceController extends PreferenceController implements
}
@Override
public void updateState(PreferenceScreen screen) {
final SwitchPreference preference = (SwitchPreference) screen.findPreference(KEY_DOZE);
// Update doze if it is available.
if (preference != null) {
int value = Settings.Secure.getInt(mContext.getContentResolver(), DOZE_ENABLED, 1);
preference.setChecked(value != 0);
}
public void updateState(Preference preference) {
int value = Settings.Secure.getInt(mContext.getContentResolver(), DOZE_ENABLED, 1);
((SwitchPreference) preference).setChecked(value != 0);
}
@Override

9
src/com/android/settings/display/FontSizePreferenceController.java
View File

@@ -17,7 +17,6 @@ import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.accessibility.ToggleFontSizePreferenceFragment;
@@ -37,16 +36,12 @@ public class FontSizePreferenceController extends PreferenceController {
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_FONT_SIZE;
}
@Override
public void updateState(PreferenceScreen screen) {
final Preference preference = screen.findPreference(KEY_FONT_SIZE);
if (preference == null) {
return;
}
public void updateState(Preference preference) {
final float currentScale = Settings.System.getFloat(mContext.getContentResolver(),
Settings.System.FONT_SCALE, 1.0f);
final Resources res = mContext.getResources();

14
src/com/android/settings/display/LiftToWakePreferenceController.java
View File

@@ -19,7 +19,6 @@ import android.hardware.SensorManager;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
@@ -41,7 +40,7 @@ public class LiftToWakePreferenceController extends PreferenceController impleme
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_LIFT_TO_WAKE;
}
@@ -58,13 +57,8 @@ public class LiftToWakePreferenceController extends PreferenceController impleme
}
@Override
public void updateState(PreferenceScreen screen) {
final SwitchPreference pref = (SwitchPreference) screen.findPreference(KEY_LIFT_TO_WAKE);
// Update lift-to-wake if it is available.
if (pref != null) {
int value =
Settings.Secure.getInt(mContext.getContentResolver(), WAKE_GESTURE_ENABLED, 0);
pref.setChecked(value != 0);
}
public void updateState(Preference preference) {
int value = Settings.Secure.getInt(mContext.getContentResolver(), WAKE_GESTURE_ENABLED, 0);
((SwitchPreference) preference).setChecked(value != 0);
}
}

2
src/com/android/settings/display/NightDisplayPreferenceController.java
View File

@@ -38,7 +38,7 @@ public class NightDisplayPreferenceController extends PreferenceController {
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_NIGHT_DISPLAY;
}
}

2
src/com/android/settings/display/NightModePreferenceController.java
View File

@@ -40,7 +40,7 @@ public class NightModePreferenceController extends PreferenceController
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_NIGHT_MODE;
}

11
src/com/android/settings/display/ScreenSaverPreferenceController.java
View File

@@ -15,7 +15,6 @@ package com.android.settings.display;
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.DreamSettings;
import com.android.settings.core.PreferenceController;
@@ -35,7 +34,7 @@ public class ScreenSaverPreferenceController extends PreferenceController {
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_SCREEN_SAVER;
}
@@ -45,11 +44,7 @@ public class ScreenSaverPreferenceController extends PreferenceController {
}
@Override
public void updateState(PreferenceScreen screen) {
final Preference preference = screen.findPreference(KEY_SCREEN_SAVER);
if (preference != null) {
preference.setSummary(
DreamSettings.getSummaryTextWithDreamName(mContext));
}
public void updateState(Preference preference) {
preference.setSummary(DreamSettings.getSummaryTextWithDreamName(mContext));
}
}

15
src/com/android/settings/display/TapToWakePreferenceController.java
View File

@@ -17,7 +17,6 @@ import android.content.Context;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
@@ -31,7 +30,7 @@ public class TapToWakePreferenceController extends PreferenceController implemen
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_TAP_TO_WAKE;
}
@@ -47,14 +46,10 @@ public class TapToWakePreferenceController extends PreferenceController implemen
}
@Override
public void updateState(PreferenceScreen screen) {
final SwitchPreference preference =
(SwitchPreference) screen.findPreference(KEY_TAP_TO_WAKE);
if (preference != null) {
int value = Settings.Secure.getInt(
mContext.getContentResolver(), Settings.Secure.DOUBLE_TAP_TO_WAKE, 0);
preference.setChecked(value != 0);
}
public void updateState(Preference preference) {
int value = Settings.Secure.getInt(
mContext.getContentResolver(), Settings.Secure.DOUBLE_TAP_TO_WAKE, 0);
((SwitchPreference) preference).setChecked(value != 0);
}
@Override

17
src/com/android/settings/display/TimeoutPreferenceController.java
View File

@@ -18,7 +18,6 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.settings.R;
@@ -48,7 +47,7 @@ public class TimeoutPreferenceController extends PreferenceController implements
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_SCREEN_TIMEOUT;
}
@@ -58,15 +57,11 @@ public class TimeoutPreferenceController extends PreferenceController implements
}
@Override
public void updateState(PreferenceScreen screen) {
final TimeoutListPreference preference =
(TimeoutListPreference) screen.findPreference(KEY_SCREEN_TIMEOUT);
if (preference == null) {
return;
}
public void updateState(Preference preference) {
final TimeoutListPreference timeoutListPreference = (TimeoutListPreference) preference;
final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
preference.setValue(String.valueOf(currentTimeout));
timeoutListPreference.setValue(String.valueOf(currentTimeout));
final DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(
Context.DEVICE_POLICY_SERVICE);
if (dpm != null) {
@@ -74,9 +69,9 @@ public class TimeoutPreferenceController extends PreferenceController implements
RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
final long maxTimeout =
dpm.getMaximumTimeToLockForUserAndProfiles(UserHandle.myUserId());
preference.removeUnusableTimeouts(maxTimeout, admin);
timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
}
updateTimeoutPreferenceDescription(preference, currentTimeout);
updateTimeoutPreferenceDescription(timeoutListPreference, currentTimeout);
}
@Override

12
src/com/android/settings/display/VrDisplayPreferenceController.java
View File

@@ -19,7 +19,6 @@ import android.content.pm.PackageManager;
import android.provider.Settings;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.settings.R;
@@ -42,18 +41,13 @@ public class VrDisplayPreferenceController extends PreferenceController implemen
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_VR_DISPLAY_PREF;
}
@Override
public void updateState(PreferenceScreen screen) {
final DropDownPreference pref =
(DropDownPreference) screen.findPreference(KEY_VR_DISPLAY_PREF);
if (pref == null) {
Log.d(TAG, "Could not find VR display preference.");
return;
}
public void updateState(Preference preference) {
final DropDownPreference pref = (DropDownPreference) preference;
pref.setEntries(new CharSequence[]{
mContext.getString(R.string.display_vr_pref_low_persistence),
mContext.getString(R.string.display_vr_pref_off),

11
src/com/android/settings/display/WallpaperPreferenceController.java
View File

@@ -16,7 +16,6 @@ package com.android.settings.display;
import android.content.Context;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
import com.android.settingslib.RestrictedLockUtils;
@@ -38,13 +37,13 @@ public class WallpaperPreferenceController extends PreferenceController {
}
@Override
protected String getPreferenceKey() {
public String getPreferenceKey() {
return KEY_WALLPAPER;
}
@Override
public void updateState(PreferenceScreen screen) {
disablePreferenceIfManaged(screen);
public void updateState(Preference preference) {
disablePreferenceIfManaged((RestrictedPreference) preference);
}
@Override
@@ -52,9 +51,7 @@ public class WallpaperPreferenceController extends PreferenceController {
return false;
}
private void disablePreferenceIfManaged(PreferenceScreen screen) {
final RestrictedPreference pref =
(RestrictedPreference) screen.findPreference(KEY_WALLPAPER);
private void disablePreferenceIfManaged(RestrictedPreference pref) {
final String restriction = DISALLOW_SET_WALLPAPER;
if (pref != null) {
pref.setDisabledByAdmin(null);