From f153f5fcb6379532f7d5ff775b1b1759b9009e9a Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 29 Feb 2016 14:54:53 -0800
Subject: [PATCH] Fix settings icon row consuming the click when tapping the
 notification

This CL makes the settings icon row invisible when it's not displaying,
this way it won't get the click event on the notification row before
the parent.

Bug: 27389571
---
 .../SystemUI/res/layout/notification_settings_icon_row.xml    | 2 +-
 .../systemui/statusbar/NotificationSettingsIconRow.java       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/notification_settings_icon_row.xml b/packages/SystemUI/res/layout/notification_settings_icon_row.xml
index 52d07fcc5cb7c..f47083af49025 100644
--- a/packages/SystemUI/res/layout/notification_settings_icon_row.xml
+++ b/packages/SystemUI/res/layout/notification_settings_icon_row.xml
@@ -19,6 +19,7 @@
     xmlns:systemui="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:visibility="invisible"
     >
 
     <com.android.systemui.statusbar.AlphaOptimizedImageView
@@ -31,7 +32,6 @@
         android:paddingBottom="@dimen/notification_gear_padding"
         android:src="@drawable/ic_settings"
         android:tint="@color/notification_gear_color"
-        android:visibility="invisible"
         android:alpha="0"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         />
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java
index 4491ebde742b9..c28abf5431c78 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java
@@ -95,12 +95,12 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC
     private void setGearAlpha(float alpha) {
         if (alpha == 0) {
             mSettingsFadedIn = false; // Can fade in again once it's gone.
-            mGearIcon.setVisibility(View.INVISIBLE);
+            setVisibility(View.INVISIBLE);
         } else {
             if (alpha == 1) {
                 mSettingsFadedIn = true;
             }
-            mGearIcon.setVisibility(View.VISIBLE);
+            setVisibility(View.VISIBLE);
         }
         mGearIcon.setAlpha(alpha);
     }