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

am 311f8a7c: am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev

Browse Source 
* commit '311f8a7cb0196d3a49a0f600856671193974b5ed':
  Make sure starting windows only draw once
This commit is contained in:
Jorim Jaggi
2015-06-02 22:49:00 +00:00
committed by Android Git Automerger
parent 8a4dbac598 311f8a7cb0
commit 8c98190898
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -289,6 +289,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
private Rect mTempRect; private Rect mTempRect;
private Rect mOutsets = new Rect(); private Rect mOutsets = new Rect();
private boolean mIsStartingWindow;
static class WindowManagerHolder { static class WindowManagerHolder {
static final IWindowManager sWindowManager = IWindowManager.Stub.asInterface( static final IWindowManager sWindowManager = IWindowManager.Stub.asInterface(
ServiceManager.getService("window")); ServiceManager.getService("window"));
@@ -3891,7 +3893,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// A pending invalidation will typically be resolved before the posted message // A pending invalidation will typically be resolved before the posted message
// would run normally in order to satisfy instance state restoration. // would run normally in order to satisfy instance state restoration.
PanelFeatureState st = getPanelState(FEATURE_OPTIONS_PANEL, false); PanelFeatureState st = getPanelState(FEATURE_OPTIONS_PANEL, false);
if (!isDestroyed() && (st == null || st.menu == null)) { if (!isDestroyed() && (st == null || st.menu == null) && !mIsStartingWindow) {
invalidatePanelMenu(FEATURE_ACTION_BAR); invalidatePanelMenu(FEATURE_ACTION_BAR);
} }
} else { } else {
@@ -4966,4 +4968,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
mDecor.updateColorViews(null, false /* animate */); mDecor.updateColorViews(null, false /* animate */);
} }
} }
public void setIsStartingWindow(boolean isStartingWindow) {
mIsStartingWindow = isStartingWindow;
}
} }

3
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2154,7 +2154,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
} }
Window win = new PhoneWindow(context); PhoneWindow win = new PhoneWindow(context);
win.setIsStartingWindow(true);
final TypedArray ta = win.getWindowStyle(); final TypedArray ta = win.getWindowStyle();
if (ta.getBoolean( if (ta.getBoolean(
com.android.internal.R.styleable.Window_windowDisablePreview, false) com.android.internal.R.styleable.Window_windowDisablePreview, false)