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

Merge "Remove On/Off string from Night light slice" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-17 09:03:07 +00:00
committed by Android (Google) Code Review
parent 7cc1469bb6 7d0150d160
commit 0ce66b9329
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mTimeFormatter.getAutoModeTimeSummary(mContext, mColorDisplayManager); return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
} }
private void updateStateInternal() { private void updateStateInternal() {

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

@@ -52,7 +52,7 @@ public class NightDisplayTimeFormatter {
return context.getString(summaryFormatResId, getAutoModeSummary(context, manager)); return context.getString(summaryFormatResId, getAutoModeSummary(context, manager));
} }
private String getAutoModeSummary(Context context, ColorDisplayManager manager) { public String getAutoModeSummary(Context context, ColorDisplayManager manager) {
final boolean isActivated = manager.isNightDisplayActivated(); final boolean isActivated = manager.isNightDisplayActivated();
final int autoMode = manager.getNightDisplayAutoMode(); final int autoMode = manager.getNightDisplayAutoMode();
if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) { if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {