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"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-19 23:05:02 +00:00
committed by Android (Google) Code Review
parent 626fb0d7e6 c6f2638009
commit 8968e61b95
14 changed files with 280 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,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
@@ -50,7 +51,7 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
@Override
public String getPreferenceKey() {
return KEY_AUTO_BRIGHTNESS;
return mAutoBrightnessKey;
}
@Override
@@ -75,7 +76,7 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
valueMap.put(SCREEN_BRIGHTNESS_MODE_MANUAL, false);
final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
getClass().getName(), KEY_AUTO_BRIGHTNESS,
getClass().getName(), mAutoBrightnessKey,
mContext.getString(R.string.display_settings));
return new InlineSwitchPayload(SCREEN_BRIGHTNESS_MODE,

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