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 am: 0ce66b9329

Browse Source 
am: bc8089527d

Change-Id: I2488ce9d1398198313af8aad01c8ed97f72b0c27
This commit is contained in:
Mill Chen
2019-04-17 02:20:46 -07:00
committed by android-build-merger
parent de836c1383 bc8089527d
commit 992f431b1e
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
public CharSequence getSummary() {
return mTimeFormatter.getAutoModeTimeSummary(mContext, mColorDisplayManager);
return mTimeFormatter.getAutoModeSummary(mContext, mColorDisplayManager);
}
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));
}
private String getAutoModeSummary(Context context, ColorDisplayManager manager) {
public String getAutoModeSummary(Context context, ColorDisplayManager manager) {
final boolean isActivated = manager.isNightDisplayActivated();
final int autoMode = manager.getNightDisplayAutoMode();
if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {