Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-10 16:00:17 +00:00
committed by Android (Google) Code Review
parent fb9ff36b95 63273d4531
commit e7979623e6
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/app_ops_info.xml
View File

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

2
packages/SystemUI/res/layout/notification_conversation_info.xml
View File

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

2
packages/SystemUI/res/layout/notification_guts.xml
View File

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

2
packages/SystemUI/res/layout/notification_info.xml
View File

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

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

@@ -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 // We never want to open the app directly if the user clicks in between
// the notifications. // the notifications.
return; return;
} else if (row.areGutsExposed()) {
// ignore click if guts are exposed
return;
} }
// Mark notification for one frame. // Mark notification for one frame.