Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the Lifecycle states." into rvc-dev am: 6182e31851

Browse Source 
Change-Id: I925c93aa6cc2d91f245bef9aa049568e8e9f2c83
This commit is contained in:
Fabian Kozynski
2020-05-29 13:20:48 +00:00
committed by Automerger Merge Worker
parent 511eb2bd52 6182e31851
commit 59056727e7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -1189,7 +1189,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
} }
mUiEventLogger.log(GlobalActionsEvent.GA_POWER_MENU_CLOSE); mUiEventLogger.log(GlobalActionsEvent.GA_POWER_MENU_CLOSE);
mWindowManagerFuncs.onGlobalActionsHidden(); mWindowManagerFuncs.onGlobalActionsHidden();
mLifecycle.setCurrentState(Lifecycle.State.DESTROYED); mLifecycle.setCurrentState(Lifecycle.State.CREATED);
} }
/** /**

4
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -17,7 +17,6 @@ package com.android.systemui.qs;
import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS; import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;
import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT; import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;
import static com.android.systemui.util.Utils.useQsMediaPlayer;
import android.annotation.ColorInt; import android.annotation.ColorInt;
import android.app.ActivityManager; import android.app.ActivityManager;
@@ -42,7 +41,6 @@ import android.view.ContextThemeWrapper;
import android.view.DisplayCutout; import android.view.DisplayCutout;
import android.view.View; import android.view.View;
import android.view.WindowInsets; import android.view.WindowInsets;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
@@ -477,7 +475,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
} else { } else {
mZenController.removeCallback(this); mZenController.removeCallback(this);
mAlarmController.removeCallback(this); mAlarmController.removeCallback(this);
mLifecycle.setCurrentState(Lifecycle.State.DESTROYED); mLifecycle.setCurrentState(Lifecycle.State.CREATED);
} }
} }