Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bade6ba authored by Matt Pietal's avatar Matt Pietal
Browse files

Hide AOD/LS layout changes 

Add support for new sysui overlay in order to disable aod/ls layouts
from the preview builds.

Bug: 178471752
Test: atest KeyguardUpdateMonitorTest
Change-Id: Iaf1dd2ba73368a3c43efe81c10aa9df42df6fdbe
parent 39a146fd

core/java/android/provider/Settings.java

+0 −9
Original line number Diff line number Diff line
@@ -14628,15 +14628,6 @@ public final class Settings { 
        public static final String PEOPLE_SPACE_CONVERSATION_TYPE =

                "people_space_conversation_type";













        /**













         * Whether to show new lockscreen & AOD UI.













         * Values are:













         * 0: Disabled (default)













         * 1: Enabled













         * @hide













         */













        public static final String SHOW_NEW_LOCKSCREEN = "show_new_lockscreen";



























        /**















         * Whether to show new notification dismissal.















         * Values are:

























packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -445,7 +445,6 @@ public class SettingsBackupTest {













                    Settings.Global.SHOW_NEW_APP_INSTALLED_NOTIFICATION_ENABLED,















                    Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,















                    Settings.Global.SHOW_PEOPLE_SPACE,













                    Settings.Global.SHOW_NEW_LOCKSCREEN,















                    Settings.Global.SHOW_NEW_NOTIF_DISMISS,















                    Settings.Global.SHOW_RESTART_IN_CRASH_DIALOG,















                    Settings.Global.SHOW_TEMPERATURE_WARNING,

































packages/SystemUI/res/values/flags.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -26,4 +26,7 @@













    <bool name="flag_notification_twocolumn">false</bool>































    <bool name="flag_qs_labels">false</bool>



























    <!-- AOD/Lockscreen alternate layout -->













    <bool name="flag_keyguard_layout">false</bool>















</resources>
























packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java



+6
−19




























Original line number
Diff line number
Diff line








@@ -104,6 +104,7 @@ import com.android.systemui.dump.DumpManager;













import com.android.systemui.plugins.statusbar.StatusBarStateController;















import com.android.systemui.shared.system.TaskStackChangeListener;















import com.android.systemui.shared.system.TaskStackChangeListeners;













import com.android.systemui.statusbar.FeatureFlags;















import com.android.systemui.statusbar.StatusBarState;















import com.android.systemui.statusbar.phone.KeyguardBypassController;















import com.android.systemui.util.Assert;










@@ -282,7 +283,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab













    private final ArrayList<WeakReference<KeyguardUpdateMonitorCallback>>















            mCallbacks = Lists.newArrayList();















    private ContentObserver mDeviceProvisionedObserver;













    private ContentObserver mLockScreenModeObserver;















    private ContentObserver mTimeFormatChangeObserver;































    private boolean mSwitchingUser;










@@ -1612,7 +1612,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab













            @Background Executor backgroundExecutor,















            StatusBarStateController statusBarStateController,















            LockPatternUtils lockPatternUtils,













            AuthController authController) {













            AuthController authController,













            FeatureFlags featureFlags) {















        mContext = context;















        mSubscriptionManager = SubscriptionManager.from(context);















        mDeviceProvisioned = isDeviceProvisionedInSettingsDb();










@@ -1878,16 +1879,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab













            }















        }





























        updateLockScreenMode();













        mLockScreenModeObserver = new ContentObserver(mHandler) {













            @Override













            public void onChange(boolean selfChange) {













                updateLockScreenMode();













            }













        };













        mContext.getContentResolver().registerContentObserver(













                Settings.Global.getUriFor(Settings.Global.SHOW_NEW_LOCKSCREEN),













                false, mLockScreenModeObserver);













        updateLockScreenMode(featureFlags.isKeyguardLayoutEnabled());































        mTimeFormatChangeObserver = new ContentObserver(mHandler) {















            @Override









@@ -1904,9 +1896,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab













                false, mTimeFormatChangeObserver, UserHandle.USER_ALL);















    }





























    private void updateLockScreenMode() {













        final int newMode = Settings.Global.getInt(mContext.getContentResolver(),













                Settings.Global.SHOW_NEW_LOCKSCREEN, LOCK_SCREEN_MODE_LAYOUT_1);













    private void updateLockScreenMode(boolean isEnabled) {













        final int newMode = isEnabled ? LOCK_SCREEN_MODE_LAYOUT_1 : LOCK_SCREEN_MODE_NORMAL;















        if (newMode != mLockScreenMode) {















            mLockScreenMode = newMode;















            mHandler.sendEmptyMessage(MSG_LOCK_SCREEN_MODE);










@@ -3129,10 +3120,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab













            mContext.getContentResolver().unregisterContentObserver(mDeviceProvisionedObserver);















        }





























        if (mLockScreenModeObserver != null) {













            mContext.getContentResolver().unregisterContentObserver(mLockScreenModeObserver);













        }





























        if (mTimeFormatChangeObserver != null) {















            mContext.getContentResolver().unregisterContentObserver(mTimeFormatChangeObserver);















        }

































packages/SystemUI/src/com/android/systemui/statusbar/FeatureFlags.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -57,4 +57,8 @@ public class FeatureFlags {













    public boolean isQSLabelsEnabled() {















        return mFlagReader.isEnabled(R.bool.flag_qs_labels);















    }



























    public boolean isKeyguardLayoutEnabled() {













        return mFlagReader.isEnabled(R.bool.flag_keyguard_layout);













    }















}