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

Fixing issue with play/pause buttons being inverted.

Browse Source 
Test: Launch PiP with media session and no custom actions
Change-Id: Ib58b36fba19068dc9c96199b7b6e511fd41dc7ed
This commit is contained in:
Winson Chung
2017-02-07 16:05:06 -08:00
parent f4872e4110
commit b0103abff7
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java
View File

@@ -83,9 +83,7 @@ public class PipMediaController {
private MediaController.Callback mPlaybackChangedListener = new MediaController.Callback() {
@Override
public void onPlaybackStateChanged(PlaybackState state) {
if (!mListeners.isEmpty()) {
notifyActionsChanged(getMediaActions());
}
notifyActionsChanged();
}
};
@@ -146,9 +144,9 @@ public class PipMediaController {
boolean isPlaying = MediaSession.isActiveState(state);
long actions = mMediaController.getPlaybackState().getActions();
if (!isPlaying && ((actions & PlaybackState.ACTION_PLAY) != 0)) {
mediaActions.add(mPauseAction);
} else if (isPlaying && ((actions & PlaybackState.ACTION_PAUSE) != 0)) {
mediaActions.add(mPlayAction);
} else if (isPlaying && ((actions & PlaybackState.ACTION_PAUSE) != 0)) {
mediaActions.add(mPauseAction);
}
return mediaActions;
}
@@ -202,9 +200,7 @@ public class PipMediaController {
if (controller != null) {
controller.registerCallback(mPlaybackChangedListener);
}
if (!mListeners.isEmpty()) {
notifyActionsChanged(getMediaActions());
}
notifyActionsChanged();
// TODO(winsonc): Consider if we want to close the PIP after a timeout (like on TV)
}
@@ -213,8 +209,9 @@ public class PipMediaController {
/**
* Notifies all listeners that the actions have changed.
*/
private void notifyActionsChanged(List<RemoteAction> actions) {
private void notifyActionsChanged() {
if (!mListeners.isEmpty()) {
List<RemoteAction> actions = getMediaActions();
mListeners.forEach(l -> l.onMediaActionsChanged(actions));
}
}