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

Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev

Browse Source
This commit is contained in:
Jim Miller
2013-05-31 21:41:34 +00:00
committed by Android (Google) Code Review
parent 0dc7891ccb dfb57cdcfc
commit 00d4c94625
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -118,7 +118,6 @@ public class KeyguardHostView extends KeyguardViewBase {
private KeyguardMultiUserSelectorView mKeyguardMultiUserSelectorView; private KeyguardMultiUserSelectorView mKeyguardMultiUserSelectorView;
protected int mPlaybackState;
protected int mClientGeneration; protected int mClientGeneration;
/*package*/ interface UserSwitcherCallback { /*package*/ interface UserSwitcherCallback {
@@ -205,10 +204,9 @@ public class KeyguardHostView extends KeyguardViewBase {
.getCachedDisplayClientState(); .getCachedDisplayClientState();
mTransportState = (dcs.clearing ? TRANSPORT_GONE : mTransportState = (dcs.clearing ? TRANSPORT_GONE :
(isMusicPlaying(dcs.playbackState) ? TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE)); (isMusicPlaying(dcs.playbackState) ? TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE));
mPlaybackState = dcs.playbackState;
if (DEBUG) Log.v(TAG, "Initial transport state: " if (DEBUG) Log.v(TAG, "Initial transport state: "
+ mTransportState + ", pbstate=" + mPlaybackState); + mTransportState + ", pbstate=" + dcs.playbackState);
} }
private void cleanupAppWidgetIds() { private void cleanupAppWidgetIds() {
@@ -274,18 +272,27 @@ public class KeyguardHostView extends KeyguardViewBase {
Log.v(TAG, (clearing ? "hide" : "show") + " transport, gen:" + clientGeneration); Log.v(TAG, (clearing ? "hide" : "show") + " transport, gen:" + clientGeneration);
} }
mClientGeneration = clientGeneration; mClientGeneration = clientGeneration;
mTransportState = (clearing ? TRANSPORT_GONE : TRANSPORT_INVISIBLE); final int newState = (clearing ? TRANSPORT_GONE
KeyguardHostView.this.post(mSwitchPageRunnable); : (mTransportState == TRANSPORT_VISIBLE ?
TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE));
if (newState != mTransportState) {
mTransportState = newState;
if (DEBUGXPORT) Log.v(TAG, "update widget: transport state changed");
KeyguardHostView.this.post(mSwitchPageRunnable);
}
} }
@Override @Override
public void onMusicPlaybackStateChanged(int playbackState, long eventTime) { public void onMusicPlaybackStateChanged(int playbackState, long eventTime) {
mPlaybackState = playbackState;
if (DEBUGXPORT) Log.v(TAG, "music state changed: " + playbackState); if (DEBUGXPORT) Log.v(TAG, "music state changed: " + playbackState);
if (mTransportState != TRANSPORT_GONE) { if (mTransportState != TRANSPORT_GONE) {
mTransportState = (isMusicPlaying(mPlaybackState) ? final int newState = (isMusicPlaying(playbackState) ?
TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE); TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE);
if (newState != mTransportState) {
mTransportState = newState;
if (DEBUGXPORT) Log.v(TAG, "update widget: play state changed");
KeyguardHostView.this.post(mSwitchPageRunnable);
}
} }
KeyguardHostView.this.post(mSwitchPageRunnable);
} }
}; };