From a3edbea9ad81912d3b228b631f492041237c679f Mon Sep 17 00:00:00 2001 From: Beverly Date: Thu, 23 Jul 2020 10:13:42 -0400 Subject: [PATCH] Don't force disable icons when app is fullscreen The icons should instead animate in/out and may still be visible if the user swipes down to see the status bar. This essentially is a revert of ag/12010093. Test: manual Bug: 161892877 Change-Id: I1f73159f1eb3dc1870784be6836774a9cf4d69d6 --- .../systemui/statusbar/phone/StatusBar.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 1f2a2c652331f..c5571e8ceb20b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -18,9 +18,6 @@ package com.android.systemui.statusbar.phone; import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT; import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; -import static android.app.StatusBarManager.DISABLE2_SYSTEM_ICONS; -import static android.app.StatusBarManager.DISABLE_CLOCK; -import static android.app.StatusBarManager.DISABLE_NOTIFICATION_ICONS; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.app.StatusBarManager.WindowType; @@ -4174,7 +4171,6 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void setTopAppHidesStatusBar(boolean topAppHidesStatusBar) { mTopHidesStatusBar = topAppHidesStatusBar; - updateStatusBarIcons(topAppHidesStatusBar); if (!topAppHidesStatusBar && mWereIconsJustHidden) { // Immediately update the icon hidden state, since that should only apply if we're // staying fullscreen. @@ -4184,17 +4180,6 @@ public class StatusBar extends SystemUI implements DemoMode, updateHideIconsForBouncer(true /* animate */); } - private void updateStatusBarIcons(boolean topAppHidesStatusBar) { - int flags1 = StatusBarManager.DISABLE_NONE; - int flags2 = StatusBarManager.DISABLE2_NONE; - if (topAppHidesStatusBar) { - flags1 = DISABLE_NOTIFICATION_ICONS | DISABLE_CLOCK; - flags2 = DISABLE2_SYSTEM_ICONS; - } - - mCommandQueue.disable(mDisplayId, flags1, flags2, false); - } - protected void toggleKeyboardShortcuts(int deviceId) { KeyboardShortcuts.toggle(mContext, deviceId); }