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

Merge "Fix flicker in Dark theme" into tm-dev am: 71fe20ea8b am: 596644171b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18659336

Change-Id: I70b1572efb652df90ddaaa633e34cc8fad0e543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2022-06-01 03:06:41 +00:00
committed by Automerger Merge Worker
parent ecfb8ca300 596644171b
commit f34bac0ee6
3 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/display/darkmode/DarkModeCustomPreferenceController.java
View File

@@ -27,7 +27,6 @@ import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
/**
* Controller for custom mode night mode time settings
@@ -35,7 +34,6 @@ import java.time.format.DateTimeFormatter;
public class DarkModeCustomPreferenceController extends BasePreferenceController {
private static final String START_TIME_KEY = "dark_theme_start_time";
private static final String END_TIME_KEY = "dark_theme_end_time";
public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm a");
private final UiModeManager mUiModeManager;
private TimeFormatter mFormat;
private DarkModeSettingsFragment mFragmet;
@@ -63,7 +61,10 @@ public class DarkModeCustomPreferenceController extends BasePreferenceController
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return mUiModeManager.getNightMode() == MODE_NIGHT_CUSTOM
&& mUiModeManager.getNightModeCustomType()
== UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
public TimePickerDialog getDialog() {
@@ -88,13 +89,6 @@ public class DarkModeCustomPreferenceController extends BasePreferenceController
@Override
protected void refreshSummary(Preference preference) {
if (mUiModeManager.getNightMode() != MODE_NIGHT_CUSTOM
|| mUiModeManager.getNightModeCustomType()
!= UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE) {
preference.setVisible(false);
return;
}
preference.setVisible(true);
final LocalTime time;
if (TextUtils.equals(getPreferenceKey(), START_TIME_KEY)) {
time = mUiModeManager.getCustomNightModeStart();

11
src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
View File

@@ -21,6 +21,7 @@ import android.os.Bundle;
import android.os.PowerManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,9 +44,6 @@ public class DarkModeSettingsFragment extends DashboardFragment {
private DarkModeObserver mContentObserver;
private DarkModeCustomPreferenceController mCustomStartController;
private DarkModeCustomPreferenceController mCustomEndController;
private Runnable mCallback = () -> {
updatePreferenceStates();
};
private static final int DIALOG_START_TIME = 0;
private static final int DIALOG_END_TIME = 1;
@@ -60,7 +58,12 @@ public class DarkModeSettingsFragment extends DashboardFragment {
public void onStart() {
super.onStart();
// Listen for changes only while visible.
mContentObserver.subscribe(mCallback);
mContentObserver.subscribe(() -> {
PreferenceScreen preferenceScreen = getPreferenceScreen();
mCustomStartController.displayPreference(preferenceScreen);
mCustomEndController.displayPreference(preferenceScreen);
updatePreferenceStates();
});
}
@Override