diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/notification.xml | 21 | ||||
| -rw-r--r-- | res/layout/notification_footer.xml | 2 | ||||
| -rw-r--r-- | res/layout/notification_main.xml | 17 |
3 files changed, 12 insertions, 28 deletions
diff --git a/res/layout/notification.xml b/res/layout/notification.xml index d828c4a36..48c7b48b9 100644 --- a/res/layout/notification.xml +++ b/res/layout/notification.xml @@ -20,7 +20,7 @@ android:layout_width="@dimen/bg_pill_width" android:layout_height="wrap_content" android:elevation="@dimen/deep_shortcuts_elevation" - android:background="@drawable/bg_white_pill"> + android:background="@drawable/bg_white_round_rect"> <RelativeLayout android:layout_width="match_parent" @@ -28,27 +28,10 @@ android:orientation="vertical" android:clipChildren="false"> - <TextView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_footer_collapsed_height" - android:gravity="center_vertical" - android:textAlignment="center" - android:text="@string/notifications_header" - android:elevation="@dimen/notification_elevation" - android:background="@drawable/bg_white_pill_top" /> - - <View - android:id="@+id/divider" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_divider_height" - android:layout_below="@id/header" /> - <include layout="@layout/notification_main" android:id="@+id/main_view" android:layout_width="match_parent" - android:layout_height="@dimen/bg_pill_height" - android:layout_below="@id/divider" /> + android:layout_height="@dimen/notification_main_height" /> <include layout="@layout/notification_footer" android:id="@+id/footer" diff --git a/res/layout/notification_footer.xml b/res/layout/notification_footer.xml index ceea24a66..c025819a2 100644 --- a/res/layout/notification_footer.xml +++ b/res/layout/notification_footer.xml @@ -20,7 +20,6 @@ android:layout_height="match_parent" android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@drawable/bg_white_pill_bottom" android:elevation="@dimen/notification_elevation" android:clipChildren="false" > @@ -34,6 +33,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" + android:gravity="end" android:padding="@dimen/notification_footer_icon_row_padding" android:clipToPadding="false" android:clipChildren="false"/> diff --git a/res/layout/notification_main.xml b/res/layout/notification_main.xml index 84827f114..d036fe5d2 100644 --- a/res/layout/notification_main.xml +++ b/res/layout/notification_main.xml @@ -21,20 +21,14 @@ android:layout_height="match_parent" android:orientation="horizontal" android:focusable="true" + android:padding="@dimen/notification_padding" android:elevation="@dimen/notification_elevation" > - <View - android:id="@+id/popup_item_icon" - android:layout_width="@dimen/notification_icon_size" - android:layout_height="@dimen/notification_icon_size" - android:layout_marginStart="@dimen/notification_icon_margin_start" - android:layout_gravity="center_vertical" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:layout_marginStart="@dimen/notification_text_margin_start" + android:layout_weight="1" android:gravity="center_vertical"> <TextView android:id="@+id/title" @@ -56,5 +50,12 @@ android:layout_height="wrap_content" /> </LinearLayout> + <View + android:id="@+id/popup_item_icon" + android:layout_width="@dimen/notification_icon_size" + android:layout_height="@dimen/notification_icon_size" + android:layout_weight="0" + android:layout_gravity="center_vertical" /> + </com.android.launcher3.notification.NotificationMainView> |