Merge "Merge "Fix the Lifecycle states." into rvc-dev am: 6182e31851 am:... (1b137a6b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**

+1 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}