diff options
| author | 2021-09-20 16:06:30 +0000 | |
|---|---|---|
| committer | 2021-09-20 16:06:30 +0000 | |
| commit | be7e7e2d63e6973aac3abfd1a834199024bb052e (patch) | |
| tree | 0bd7c47697ef3f546d5af7a0ee0fac3373b4697c | |
| parent | f6d5da7d283650ded03af4f743689def71f8c647 (diff) | |
| parent | b8d45c6adeae68f8b7499302926ac9051d3c5a42 (diff) | |
Merge "Make footer button tap target 48dp tall" into sc-qpr1-dev
| -rw-r--r-- | packages/SystemUI/res/drawable/notif_footer_btn_background.xml | 31 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_notification_footer.xml | 8 |
2 files changed, 20 insertions, 19 deletions
diff --git a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml index 6725a26c102c..e6266754c0af 100644 --- a/packages/SystemUI/res/drawable/notif_footer_btn_background.xml +++ b/packages/SystemUI/res/drawable/notif_footer_btn_background.xml @@ -14,19 +14,20 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - - -<shape xmlns:android="http://schemas.android.com/apk/res/android" +<ripple xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" - android:shape="rectangle"> - <solid - android:color="?androidprv:attr/colorSurface" - /> - <corners android:radius="20dp" /> - - <padding - android:left="20dp" - android:right="20dp"> - </padding> - -</shape>
\ No newline at end of file + android:color="?android:attr/colorControlHighlight"> + <item> + <inset + android:insetBottom="4dp" + android:insetTop="4dp"> + <shape android:shape="rectangle"> + <corners android:radius="20dp" /> + <padding + android:left="20dp" + android:right="20dp" /> + <solid android:color="?androidprv:attr/colorSurface" /> + </shape> + </inset> + </item> +</ripple> diff --git a/packages/SystemUI/res/layout/status_bar_notification_footer.xml b/packages/SystemUI/res/layout/status_bar_notification_footer.xml index 412276d05ea3..bbb8df1c5a4a 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_footer.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_footer.xml @@ -30,8 +30,8 @@ style="@style/TextAppearance.NotificationSectionHeaderButton" android:id="@+id/manage_text" android:layout_width="wrap_content" - android:layout_height="40dp" - android:layout_marginTop="16dp" + android:layout_height="48dp" + android:layout_marginTop="12dp" android:layout_gravity="start" android:background="@drawable/notif_footer_btn_background" android:focusable="true" @@ -43,8 +43,8 @@ style="@style/TextAppearance.NotificationSectionHeaderButton" android:id="@+id/dismiss_text" android:layout_width="wrap_content" - android:layout_height="40dp" - android:layout_marginTop="16dp" + android:layout_height="48dp" + android:layout_marginTop="12dp" android:layout_gravity="end" android:background="@drawable/notif_footer_btn_background" android:focusable="true" |