commit a92dded71d7a4e9f579586c6ae40db5512e5e4c1
author Babak Bostan <babakbo@google.com> Mon Sep 14 12:49:08 2020 -0700
committer Babak <babakbo@google.com> Tue Sep 15 14:50:01 2020 -0700
tree 32c4a866ff8d632761943c4c5d850e5c4a69b3ab
parent 44a548a54a68e253bbb0a21cdca655196830ec73

Fix Now Playing toolbar initial state

Bug: 167244976
Test: Manualy
Change-Id: I2530ccac67fd536c0cfc9f6f3f81c75b7faee856

src/com/android/car/media/PlaybackFragment.java

diff --git a/src/com/android/car/media/PlaybackFragment.java b/src/com/android/car/media/PlaybackFragment.java
index 05ac74b..90ab245 100644
--- a/src/com/android/car/media/PlaybackFragment.java
+++ b/src/com/android/car/media/PlaybackFragment.java
@@ -641,6 +641,12 @@
         mItemAnimator.setSupportsChangeAnimations(false);
         mQueue.setItemAnimator(mItemAnimator);
 
+        // Make sure the AppBar menu reflects the initial state of playback fragment.
+        updateAppBarMenu(mHasQueue);
+        if (mQueueMenuItem != null) {
+            mQueueMenuItem.setActivated(mQueueIsVisible);
+        }
+
         getPlaybackViewModel().getQueue().observe(this, this::setQueue);
 
         getPlaybackViewModel().hasQueue().observe(getViewLifecycleOwner(), hasQueue -> {
@@ -693,7 +699,7 @@
         mViewModel.setQueueVisible(updatedQueueVisibility);
     }
 
-    private void setQueueState(boolean hasQueue, boolean visible) {
+    private void updateAppBarMenu(boolean hasQueue) {
         if (hasQueue && mQueueMenuItem == null) {
             mQueueMenuItem = MenuItem.builder(getContext())
                     .setIcon(R.drawable.ic_queue_button)
@@ -701,10 +707,14 @@
                     .setOnClickListener(button -> toggleQueueVisibility())
                     .build();
         }
+        mAppBarController.setMenuItems(
+                hasQueue ? Collections.singletonList(mQueueMenuItem) : Collections.emptyList());
+    }
+
+    private void setQueueState(boolean hasQueue, boolean visible) {
         if (mHasQueue != hasQueue) {
             mHasQueue = hasQueue;
-            mAppBarController.setMenuItems(
-                    hasQueue ? Collections.singletonList(mQueueMenuItem) : Collections.emptyList());
+            updateAppBarMenu(hasQueue);
         }
         if (mQueueMenuItem != null) {
             mQueueMenuItem.setActivated(visible);