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

Merge "Remove duplicates between battery and display settings" into oc-dev

Browse Source 
am: 1c7e25d3b6

Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be
This commit is contained in:
Matthew Fritze
2017-04-22 00:59:40 +00:00
committed by android-build-merger
parent 0bf520852d 1c7e25d3b6
commit a95fc0f05f
14 changed files with 279 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/DisplaySettings.java
View File

@@ -51,6 +51,9 @@ import java.util.List;
public class DisplaySettings extends DashboardFragment {
private static final String TAG = "DisplaySettings";
private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
@Override
public int getMetricsCategory() {
return MetricsEvent.DISPLAY;
@@ -85,7 +88,7 @@ public class DisplaySettings extends DashboardFragment {
private static List<PreferenceController> buildPreferenceControllers(
Context context, Lifecycle lifecycle) {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new AutoBrightnessPreferenceController(context));
controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
controllers.add(new AutoRotatePreferenceController(context));
controllers.add(new CameraGesturePreferenceController(context));
controllers.add(new DozePreferenceController(context));
@@ -100,7 +103,7 @@ public class DisplaySettings extends DashboardFragment {
controllers.add(new DoubleTapScreenPreferenceController(
context, lifecycle, ambientDisplayConfig, UserHandle.myUserId()));
controllers.add(new TapToWakePreferenceController(context));
controllers.add(new TimeoutPreferenceController(context));
controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
controllers.add(new VrDisplayPreferenceController(context));
controllers.add(new WallpaperPreferenceController(context));
controllers.add(new ThemePreferenceController(context));

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

@@ -33,10 +33,11 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
public class AutoBrightnessPreferenceController extends PreferenceController implements
Preference.OnPreferenceChangeListener {
private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness";
private final String mAutoBrightnessKey;
public AutoBrightnessPreferenceController(Context context) {
public AutoBrightnessPreferenceController(Context context, String key) {
super(context);
mAutoBrightnessKey = key;
}
@Override
@@ -47,7 +48,7 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
@Override
public String getPreferenceKey() {
return KEY_AUTO_BRIGHTNESS;
return mAutoBrightnessKey;
}
@Override

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

@@ -35,10 +35,11 @@ public class TimeoutPreferenceController extends PreferenceController implements
/** If there is no setting in the provider, use this. */
public static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
private final String mScreenTimeoutKey;
public TimeoutPreferenceController(Context context) {
public TimeoutPreferenceController(Context context, String key) {
super(context);
mScreenTimeoutKey = key;
}
@Override
@@ -48,7 +49,7 @@ public class TimeoutPreferenceController extends PreferenceController implements
@Override
public String getPreferenceKey() {
return KEY_SCREEN_TIMEOUT;
return mScreenTimeoutKey;
}
@Override

2
src/com/android/settings/fuelgauge/BatterySaverController.java
View File

@@ -43,7 +43,7 @@ import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
public class BatterySaverController extends PreferenceController implements
Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop {
private static final String KEY_BATTERY_SAVER = "battery_saver";
private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
private static final String TAG = "BatterySaverController";
private static final boolean DEBUG = false;

17
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -86,6 +86,9 @@ public class PowerUsageSummary extends PowerUsageBase {
private static final String KEY_SCREEN_USAGE = "screen_usage";
private static final String KEY_TIME_SINCE_LAST_FULL_CHARGE = "last_full_charge";
private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness_battery";
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout_battery";
private static final String KEY_BATTERY_SAVER_SUMMARY = "battery_saver_summary";
private static final int MENU_STATS_TYPE = Menu.FIRST;
@VisibleForTesting
@@ -185,8 +188,8 @@ public class PowerUsageSummary extends PowerUsageBase {
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new AutoBrightnessPreferenceController(context));
controllers.add(new TimeoutPreferenceController(context));
controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
controllers.add(new BatterySaverController(context, getLifecycle()));
controllers.add(new BatteryPercentagePreferenceController(context));
return controllers;
@@ -718,6 +721,16 @@ public class PowerUsageSummary extends PowerUsageBase {
sir.xmlResId = R.xml.power_usage_summary;
return Arrays.asList(sir);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> niks = new ArrayList<>();
// Duplicates in display
niks.add(KEY_AUTO_BRIGHTNESS);
niks.add(KEY_SCREEN_TIMEOUT);
niks.add(KEY_BATTERY_SAVER_SUMMARY);
return niks;
}
};
public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY