summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2017-05-01 18:13:19 +0000
committer android-build-merger <android-build-merger@google.com> 2017-05-01 18:13:19 +0000
commit8c11b89baf764059eb1b52561a122f11c7bc5ed0 (patch)
tree3c07dad3c442542864b7a728991013141567e934
parentf0d14afa61649e9ff0b21c67620d3db66fe0ca73 (diff)
parentf8e7cbffb9de3f16d1ee4329190a0423c2319545 (diff)
Merge "Ensure that the action views are always updated." into oc-dev
am: f8e7cbffb9 Change-Id: I00b603c3bcc4da09d95e1feb8d80bac2626b6b26
-rw-r--r--packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java2
1 files changed, 1 insertions, 1 deletions
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 80305a5adc02..65f24cf5ba98 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 @@ public class PipMenuActivity extends Activity {
});
} else {
actionView.setAlpha(DISABLED_ACTION_ALPHA);
- actionView.setEnabled(false);
}
+ actionView.setEnabled(action.isEnabled());
// Update the margin between actions
LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)