From 384bed509c4f9b327aba1b40e61a2347f036beb2 Mon Sep 17 00:00:00 2001 From: Abel Tesfaye Date: Wed, 9 Jun 2021 22:50:13 +0000 Subject: [PATCH 01/15] Fix battery saver not disabling adaptive sleep switch Test: locally with flame Bug: 189900026 Change-Id: I1f0bc5eb1cd021f1eb8526c020f772ce0dd96da0 --- .../settings/display/AdaptiveSleepPreferenceController.java | 1 + src/com/android/settings/display/ScreenTimeoutSettings.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java index b86a070cf84..35f9c728264 100644 --- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java +++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java @@ -90,6 +90,7 @@ public class AdaptiveSleepPreferenceController { if (enforcedAdmin != null) { mPreference.setDisabledByAdmin(enforcedAdmin); } else { + mPreference.setChecked(isChecked()); mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked() && !isPowerSaveMode()); } diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java index b4d120e4e83..66f5ed3dab4 100644 --- a/src/com/android/settings/display/ScreenTimeoutSettings.java +++ b/src/com/android/settings/display/ScreenTimeoutSettings.java @@ -81,6 +81,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements @Override public void onReceive(Context context, Intent intent) { mAdaptiveSleepBatterySaverPreferenceController.updateVisibility(); + mAdaptiveSleepController.updatePreference(); } }; From 3f656e9d0c0883542a4f2a5d51fc08aacf2d6ae5 Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Mon, 14 Jun 2021 17:35:49 +0100 Subject: [PATCH 02/15] RequestManageCredentials foldable view * Add more padding to layout * Move 'Don't allow' button to the left screen * https://screenshot.googleplex.com/6Ak35pRBZiyncb5 Bug: 189416800 Test: manual testing with emulator Change-Id: Ie17aaaa8427f8151d469a662855586c37432f116 --- .../request_manage_credentials.xml | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 res/layout-sw600dp/request_manage_credentials.xml diff --git a/res/layout-sw600dp/request_manage_credentials.xml b/res/layout-sw600dp/request_manage_credentials.xml new file mode 100644 index 00000000000..f8cf5596f03 --- /dev/null +++ b/res/layout-sw600dp/request_manage_credentials.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +