commit f8e7cbffb9de3f16d1ee4329190a0423c2319545
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 01 17:56:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 01 17:56:12 2017 +0000
tree c1a361089edd316df095f53e4efa697962f313a8
parent 63827ce61b95439d97dfde163cf4423fa638f0be
parent d61a19e533bf05f2bf8cb4b3b3d01d3a224a19a0

Merge "Ensure that the action views are always updated." into oc-dev

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 80305a5..65f24cf 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -460,8 +460,8 @@
                         });
                     } else {
                         actionView.setAlpha(DISABLED_ACTION_ALPHA);
-                        actionView.setEnabled(false);
                     }
+                    actionView.setEnabled(action.isEnabled());
 
                     // Update the margin between actions
                     LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)