auto import from //branches/cupcake/...@132569 (e1e5e408) · Commits · e / os / android_frameworks_base

policy/com/android/internal/policy/impl/KeyguardViewBase.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ public abstract class KeyguardViewBase extends FrameLayout {
		}
		} else if (event.getAction() == KeyEvent.ACTION_UP) {
		switch (keyCode) {
		case KeyEvent.KEYCODE_MUTE:
		case KeyEvent.KEYCODE_HEADSETHOOK:
		case KeyEvent.KEYCODE_PLAYPAUSE:
		case KeyEvent.KEYCODE_STOP:

policy/com/android/internal/policy/impl/KeyguardViewManager.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -100,10 +100,9 @@ public class KeyguardViewManager implements KeyguardWindowController {
		mKeyguardHost = new KeyguardViewHost(mContext, mCallback);

		final int stretch = ViewGroup.LayoutParams.FILL_PARENT;
		int flags = WindowManager.LayoutParams.FLAG_DITHER
		int flags = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN
		/*\| WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
		\| WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR*/
		\| WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
		\| WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR*/ ;
		if (!mNeedsInput) {
		flags \|= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
		}

policy/com/android/internal/policy/impl/KeyguardViewMediator.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -641,6 +641,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		switch (keyCode) {
		case KeyEvent.KEYCODE_VOLUME_UP:
		case KeyEvent.KEYCODE_VOLUME_DOWN:
		case KeyEvent.KEYCODE_MUTE:
		case KeyEvent.KEYCODE_HEADSETHOOK:
		case KeyEvent.KEYCODE_PLAYPAUSE:
		case KeyEvent.KEYCODE_STOP:

policy/com/android/internal/policy/impl/PhoneWindow.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -1163,6 +1163,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		return true;
		}

		case KeyEvent.KEYCODE_MUTE:
		case KeyEvent.KEYCODE_HEADSETHOOK:
		case KeyEvent.KEYCODE_PLAYPAUSE:
		case KeyEvent.KEYCODE_STOP:

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+31 −21

Original line number	Diff line number	Diff line
		@@ -344,6 +344,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		* screen turning on and current app has nosensor based orientation, do nothing
		*/
		void updateOrientationListener() {
		if (!mOrientationListener.canDetectOrientation()) {
		// If sensor is turned off or nonexistent for some reason
		return;
		}
		//Could have been invoked due to screen turning on or off or
		//change of the currently visible window's orientation
		if(localLOGV) Log.i(TAG, "Screen status="+mScreenOn+
		@@ -1206,15 +1210,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		/** {@inheritDoc} */
		public void animatingWindowLw(WindowState win,
		WindowManager.LayoutParams attrs) {
		if (mTopFullscreenOpaqueWindowState == null
		if (win.isVisibleLw()) {
		if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {
		mForceStatusBar = true;
		} else if (mTopFullscreenOpaqueWindowState == null
		&& attrs.type >= FIRST_APPLICATION_WINDOW
		&& attrs.type <= LAST_APPLICATION_WINDOW
		&& win.fillsScreenLw(mW, mH, true)
		&& win.fillsScreenLw(mW, mH, true, false)
		&& win.isVisibleLw()) {
		mTopFullscreenOpaqueWindowState = win;
		} else if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0
		&& win.isVisibleLw()) {
		mForceStatusBar = true;
		}
		}
		}

		@@ -1222,9 +1227,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		public boolean finishAnimationLw() {
		boolean changed = false;
		if (mStatusBar != null) {
		//Log.i(TAG, "force=" + mForceStatusBar
		// + " top=" + mTopFullscreenOpaqueWindowState);
		if (mForceStatusBar) {
		changed \|= mStatusBar.showLw(true);
		} else if (mTopFullscreenOpaqueWindowState != null) {
		//Log.i(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw()
		// + " shown frame: " + mTopFullscreenOpaqueWindowState.getShownFrameLw());
		//Log.i(TAG, "attr: " + mTopFullscreenOpaqueWindowState.getAttrs());
		WindowManager.LayoutParams lp =
		mTopFullscreenOpaqueWindowState.getAttrs();
		boolean hideStatusBar =