diff options
| author | 2020-05-29 13:20:48 +0000 | |
|---|---|---|
| committer | 2020-05-29 13:20:48 +0000 | |
| commit | 59056727e7bec4a4ce04fae80df48e8f038a2c6e (patch) | |
| tree | cfd2b642ae6d0cafdac2356928c197f7b4090aa3 | |
| parent | 511eb2bd5214e8ba18799d54500322def315715c (diff) | |
| parent | 6182e318510d28bd8b07520f3e88f3d238628d51 (diff) | |
Merge "Fix the Lifecycle states." into rvc-dev am: 6182e31851
Change-Id: I925c93aa6cc2d91f245bef9aa049568e8e9f2c83
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 0f3a94b74342..27d113b08f81 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -1189,7 +1189,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, } mUiEventLogger.log(GlobalActionsEvent.GA_POWER_MENU_CLOSE); mWindowManagerFuncs.onGlobalActionsHidden(); - mLifecycle.setCurrentState(Lifecycle.State.DESTROYED); + mLifecycle.setCurrentState(Lifecycle.State.CREATED); } /** diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 3b2bea8f80f2..29b3436c0b72 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -17,7 +17,6 @@ package com.android.systemui.qs; import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS; import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT; -import static com.android.systemui.util.Utils.useQsMediaPlayer; import android.annotation.ColorInt; import android.app.ActivityManager; @@ -42,7 +41,6 @@ import android.view.ContextThemeWrapper; import android.view.DisplayCutout; import android.view.View; import android.view.WindowInsets; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; @@ -477,7 +475,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements } else { mZenController.removeCallback(this); mAlarmController.removeCallback(this); - mLifecycle.setCurrentState(Lifecycle.State.DESTROYED); + mLifecycle.setCurrentState(Lifecycle.State.CREATED); } } |