acab1a0364
In Android S design, night display and dark theme only show schedule text for summary. - Rmove redundant string resource. - Remove redundant method in night display formatter. - Refactor the code in dark mode preference and night display controller. Test: See the correct behavior in screen. Fix: 174964139 Change-Id: I658b3073a0a6ed83f589103999c711e5430eaeb7
70 lines
2.7 KiB
Java
70 lines
2.7 KiB
Java
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.display;
|
|
|
|
import android.content.Context;
|
|
import android.hardware.display.ColorDisplayManager;
|
|
|
|
import com.android.settings.R;
|
|
|
|
import java.text.DateFormat;
|
|
import java.time.LocalTime;
|
|
import java.util.Calendar;
|
|
import java.util.TimeZone;
|
|
|
|
public class NightDisplayTimeFormatter {
|
|
|
|
private DateFormat mTimeFormatter;
|
|
|
|
NightDisplayTimeFormatter(Context context) {
|
|
mTimeFormatter = android.text.format.DateFormat.getTimeFormat(context);
|
|
mTimeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
|
|
}
|
|
|
|
public String getFormattedTimeString(LocalTime localTime) {
|
|
final Calendar c = Calendar.getInstance();
|
|
c.setTimeZone(mTimeFormatter.getTimeZone());
|
|
c.set(Calendar.HOUR_OF_DAY, localTime.getHour());
|
|
c.set(Calendar.MINUTE, localTime.getMinute());
|
|
c.set(Calendar.SECOND, 0);
|
|
c.set(Calendar.MILLISECOND, 0);
|
|
return mTimeFormatter.format(c.getTime());
|
|
}
|
|
|
|
public String getAutoModeSummary(Context context, ColorDisplayManager manager) {
|
|
final boolean isActivated = manager.isNightDisplayActivated();
|
|
final int autoMode = manager.getNightDisplayAutoMode();
|
|
if (autoMode == ColorDisplayManager.AUTO_MODE_CUSTOM_TIME) {
|
|
if (isActivated) {
|
|
return context.getString(R.string.night_display_summary_on_auto_mode_custom,
|
|
getFormattedTimeString(manager.getNightDisplayCustomEndTime()));
|
|
} else {
|
|
return context.getString(R.string.night_display_summary_off_auto_mode_custom,
|
|
getFormattedTimeString(manager.getNightDisplayCustomStartTime()));
|
|
}
|
|
} else if (autoMode == ColorDisplayManager.AUTO_MODE_TWILIGHT) {
|
|
return context.getString(isActivated
|
|
? R.string.night_display_summary_on_auto_mode_twilight
|
|
: R.string.night_display_summary_off_auto_mode_twilight);
|
|
} else {
|
|
return context.getString(isActivated
|
|
? R.string.night_display_summary_on_auto_mode_never
|
|
: R.string.night_display_summary_off_auto_mode_never);
|
|
}
|
|
}
|
|
}
|