Merge "Fix clickable notification row elements" into rvc-dev

packages/SystemUI/res/layout/app_ops_info.xml

@@ -19,8 +19,8 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:focusable="true"
         android:id="@+id/app_ops_info"
-        android:clickable="true"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:orientation="vertical"

packages/SystemUI/res/layout/notification_conversation_info.xml

@@ -20,7 +20,7 @@
     android:id="@+id/notification_guts"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
+    android:focusable="true"
     android:clipChildren="false"
     android:clipToPadding="true"
     android:orientation="vertical"

packages/SystemUI/res/layout/notification_guts.xml

@@ -19,8 +19,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:focusable="true"
     android:id="@+id/notification_guts"
     android:visibility="gone"
-    android:clickable="true"
     android:gravity="top|start"
     android:theme="@*android:style/Theme.DeviceDefault.Light"/>

packages/SystemUI/res/layout/notification_info.xml

@@ -20,7 +20,7 @@
     android:id="@+id/notification_guts"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
+    android:focusable="true"
     android:clipChildren="false"
     android:clipToPadding="true"
     android:orientation="vertical"

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationClicker.java

@@ -75,6 +75,9 @@ public final class NotificationClicker implements View.OnClickListener {
             // We never want to open the app directly if the user clicks in between
             // the notifications.
             return;
+        } else if (row.areGutsExposed()) {
+            // ignore click if guts are exposed
+            return;
         }
 
         // Mark notification for one frame.