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

am 1615d63b: If a window specifies flag to show even when screen is locked, the keyguard is hidden and conversely if the keyguard has been hidden its shown. this lets the window manager to hide or unhide the keyguard based on activities that specify if they want to be displayed inspite of the keyguard being shown or not.

Browse Source 
Merge commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021'

* commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021':
  If a window specifies flag to show even when screen is locked, the keyguard is hidden and conversely if the keyguard has been hidden
This commit is contained in:
Suchi Amalapurapu
2009-05-18 13:44:38 -07:00
committed by The Android Open Source Project
parent 49a864dcbd 9cdc90365f
commit 8ae60437a1
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;
import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
@@ -197,6 +198,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
WindowState mTopFullscreenOpaqueWindowState;
boolean mForceStatusBar;
boolean mHideKeyguard;
boolean mHomePressed;
Intent mHomeIntent;
boolean mSearchKeyPressed;
@@ -988,6 +990,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mTopFullscreenOpaqueWindowState = null;
mForceStatusBar = false;
mHideKeyguard = false;
// decide where the status bar goes ahead of time
if (mStatusBar != null) {
@@ -1195,6 +1198,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (DEBUG_LAYOUT) Log.v(TAG, "Fullscreen window: " + win);
mTopFullscreenOpaqueWindowState = win;
}
if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {
// TODO Add a check for the window to be full screen
if (localLOGV) Log.i(TAG, "Setting mHideKeyguard to true by win " + win);
mHideKeyguard = true;
}
}
// Dock windows carve out the bottom of the screen, so normal windows
@@ -1244,6 +1252,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
}
// Hide the key guard if a visible window explicitly specifies that it wants to be displayed
// when the screen is locked
if (mKeyguard != null) {
if (localLOGV) Log.i(TAG, "finishLayoutLw::mHideKeyguard="+mHideKeyguard);
if (mHideKeyguard) {
changed |= mKeyguard.hideLw(true);
} else {
changed |= mKeyguard.showLw(true);
}
}
if (changed && hiding) {
IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar"));