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

am 6e09858c: Don\'t enforce that search dialog is a singleton.

Browse Source 
Merge commit '6e09858c0bd13a321ed716b670b361e62b1536e4'

* commit '6e09858c0bd13a321ed716b670b361e62b1536e4':
  Don't enforce that search dialog is a singleton.
This commit is contained in:
Bjorn Bringert
2009-06-12 08:26:19 -07:00
committed by The Android Open Source Project
parent f4cd7a3187 a163bdcf5c
commit 8160c8edce
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -160,7 +160,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
boolean mSafeMode;
WindowState mStatusBar = null;
WindowState mSearchBar = null;
WindowState mKeyguard = null;
KeyguardViewMediator mKeyguardMediator;
GlobalActions mGlobalActions;
@@ -702,7 +701,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
* Currently enforces that three window types are singletons:
* <ul>
* <li>STATUS_BAR_TYPE</li>
* <li>SEARCH_BAR_TYPE</li>
* <li>KEYGUARD_TYPE</li>
* </ul>
*
@@ -719,12 +717,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
mStatusBar = win;
break;
case TYPE_SEARCH_BAR:
if (mSearchBar != null) {
return WindowManagerImpl.ADD_MULTIPLE_SINGLETON;
}
mSearchBar = win;
break;
case TYPE_KEYGUARD:
if (mKeyguard != null) {
return WindowManagerImpl.ADD_MULTIPLE_SINGLETON;
@@ -740,9 +732,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mStatusBar == win) {
mStatusBar = null;
}
else if (mSearchBar == win) {
mSearchBar = null;
}
else if (mKeyguard == win) {
mKeyguard = null;
}