diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-01 21:59:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-01 21:59:17 +0000 |
| commit | 9ed87a20709a752812585d2513bf114f1ce264fb (patch) | |
| tree | 346f8776981e3c801eff0f55a573ea42f30c714c /src/com/android | |
| parent | 9482d17edacf30e0a63a22e6ab96d38f000d5cb7 (diff) | |
| parent | 4460ae7e569b0c5e9efd6cc3d27db14717e2cb83 (diff) | |
| download | Media-9ed87a20709a752812585d2513bf114f1ce264fb.tar.gz | |
Merge "Fix control bar expansion breaking playback screen" into pi-car-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/car/media/PlaybackFragment.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/car/media/PlaybackFragment.java b/src/com/android/car/media/PlaybackFragment.java index 1332546..21dc0b4 100644 --- a/src/com/android/car/media/PlaybackFragment.java +++ b/src/com/android/car/media/PlaybackFragment.java @@ -58,6 +58,7 @@ import java.util.Objects; public class PlaybackFragment extends Fragment { private static final String TAG = "PlaybackFragment"; + private View mExpandedControlBarScrim; private PlaybackControlsActionBar mPlaybackControls; private QueueItemsAdapter mQueueAdapter; private RecyclerView mQueue; @@ -171,6 +172,8 @@ public class PlaybackFragment extends Fragment { mQueueButton.setOnClickListener(button -> onQueueClicked()); mNavIconContainer = view.findViewById(R.id.nav_icon_container); mNavIconContainer.setOnClickListener(nav -> onCollapse()); + mExpandedControlBarScrim = view.findViewById(R.id.playback_controls_expanded_scrim); + mExpandedControlBarScrim.setAlpha(0f); MediaAppSelectorWidget appIcon = view.findViewById(R.id.app_icon_container); appIcon.setFragmentActivity(getActivity()); @@ -197,6 +200,12 @@ public class PlaybackFragment extends Fragment { mPlaybackControls = playbackControls; mPlaybackControls.setModel(getPlaybackViewModel(), getViewLifecycleOwner()); mPlaybackControls.setAnimationViewGroup(mRootView); + mPlaybackControls.registerExpandCollapseCallback((expanding) -> + mExpandedControlBarScrim.animate() + .alpha(expanding ? 1.0f : 0f) + .setDuration(getContext().getResources().getInteger( + expanding ? R.integer.control_bar_expand_anim_duration + : R.integer.control_bar_collapse_anim_duration))); } private void initQueue() { |