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

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

Browse Source 
* commit '00d4c94625226ab325def94e9b82074f39572b43':
  Fix keyguard issue where an incoming SMS would switch widget
This commit is contained in:
Jim Miller
2013-06-01 08:23:17 -07:00
committed by Android Git Automerger
parent fd04f5e31a 00d4c94625
commit 2542fd54ac
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;
protected int mPlaybackState;
protected int mClientGeneration;
/*package*/ interface UserSwitcherCallback {
@@ -205,10 +204,9 @@ public class KeyguardHostView extends KeyguardViewBase {
.getCachedDisplayClientState();
mTransportState = (dcs.clearing ? TRANSPORT_GONE :
(isMusicPlaying(dcs.playbackState) ? TRANSPORT_VISIBLE : TRANSPORT_INVISIBLE));
mPlaybackState = dcs.playbackState;
if (DEBUG) Log.v(TAG, "Initial transport state: "
+ mTransportState + ", pbstate=" + mPlaybackState);
+ mTransportState + ", pbstate=" + dcs.playbackState);
}
private void cleanupAppWidgetIds() {
@@ -274,18 +272,27 @@ public class KeyguardHostView extends KeyguardViewBase {
Log.v(TAG, (clearing ? "hide" : "show") + " transport, gen:" + clientGeneration);
}
mClientGeneration = clientGeneration;
mTransportState = (clearing ? TRANSPORT_GONE : TRANSPORT_INVISIBLE);
KeyguardHostView.this.post(mSwitchPageRunnable);
final int newState = (clearing ? TRANSPORT_GONE
: (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
public void onMusicPlaybackStateChanged(int playbackState, long eventTime) {
mPlaybackState = playbackState;
if (DEBUGXPORT) Log.v(TAG, "music state changed: " + playbackState);
if (mTransportState != TRANSPORT_GONE) {
mTransportState = (isMusicPlaying(mPlaybackState) ?
final int newState = (isMusicPlaying(playbackState) ?
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);
}
};