diff options
Diffstat (limited to 'data/res/layout')
18 files changed, 241 insertions, 109 deletions
diff --git a/data/res/layout/autofill_dataset_picker.xml b/data/res/layout/autofill_dataset_picker.xml index a88836ef..ef19f870 100644 --- a/data/res/layout/autofill_dataset_picker.xml +++ b/data/res/layout/autofill_dataset_picker.xml @@ -14,7 +14,8 @@ limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<view xmlns:android="http://schemas.android.com/apk/res/android" + class="com.android.server.autofill.ui.FillUi$AutofillFrameLayout" android:id="@+id/autofill_dataset_picker" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -30,4 +31,4 @@ android:visibility="gone"> </ListView> -</FrameLayout> +</view> diff --git a/data/res/layout/autofill_dataset_picker_fullscreen.xml b/data/res/layout/autofill_dataset_picker_fullscreen.xml new file mode 100644 index 00000000..07298c18 --- /dev/null +++ b/data/res/layout/autofill_dataset_picker_fullscreen.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/autofill_dataset_picker" + style="@style/AutofillDatasetPicker" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/autofill_window_title" + android:layout_above="@+id/autofill_dataset_container" + android:layout_alignStart="@+id/autofill_dataset_container" + android:textSize="16sp"/> + + <!-- autofill_container is the common parent for inserting authentication item or + autofill_dataset_list--> + <FrameLayout + android:id="@+id/autofill_dataset_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true"> + <ListView + android:id="@+id/autofill_dataset_list" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="true" + android:divider="@null" + android:drawSelectorOnTop="true" + android:visibility="gone"/> + </FrameLayout> + +</RelativeLayout> diff --git a/data/res/layout/autofill_save.xml b/data/res/layout/autofill_save.xml index 5c5b985b..d9035242 100644 --- a/data/res/layout/autofill_save.xml +++ b/data/res/layout/autofill_save.xml @@ -35,8 +35,8 @@ <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:orientation="vertical"> <LinearLayout @@ -52,7 +52,7 @@ <TextView android:id="@+id/autofill_save_title" - android:paddingLeft="8dp" + android:paddingStart="8dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/autofill_save_title" @@ -100,7 +100,7 @@ android:id="@+id/autofill_save_yes" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/Widget.Material.Button.Colored" + style="@style/Widget.DeviceDefault.Button.Colored" android:text="@string/autofill_save_yes"> </Button> diff --git a/data/res/layout/cascading_menu_item_layout.xml b/data/res/layout/cascading_menu_item_layout.xml new file mode 100644 index 00000000..7d186359 --- /dev/null +++ b/data/res/layout/cascading_menu_item_layout.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Keep in sync with popup_menu_item_layout.xml (which only differs in the title and shortcut + position). --> +<com.android.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minWidth="196dip" + android:orientation="vertical" > + + <ImageView + android:id="@+id/group_divider" + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginTop="4dip" + android:layout_marginBottom="4dip" + android:background="@drawable/list_divider_material" /> + + <LinearLayout + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="?attr/dropdownListPreferredItemHeight" + android:paddingEnd="16dip" + android:duplicateParentState="true" > + + <!-- Icon will be inserted here. --> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dip" + android:textAppearance="?attr/textAppearanceLargePopupMenu" + android:singleLine="true" + android:duplicateParentState="true" + android:textAlignment="viewStart" /> + + <Space + android:layout_width="0dip" + android:layout_height="1dip" + android:layout_weight="1"/> + + <TextView + android:id="@+id/shortcut" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dip" + android:textAppearance="?attr/textAppearanceSmallPopupMenu" + android:singleLine="true" + android:duplicateParentState="true" + android:textAlignment="viewEnd" /> + + <ImageView + android:id="@+id/submenuarrow" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginStart="8dp" + android:scaleType="center" + android:visibility="gone" /> + + <!-- Checkbox, and/or radio button will be inserted here. --> + + </LinearLayout> + +</com.android.internal.view.menu.ListMenuItemView> diff --git a/data/res/layout/heavy_weight_switcher.xml b/data/res/layout/heavy_weight_switcher.xml index c17e5557..dbd8ecef 100644 --- a/data/res/layout/heavy_weight_switcher.xml +++ b/data/res/layout/heavy_weight_switcher.xml @@ -15,31 +15,30 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:padding="4dp" + android:orientation="vertical" android:padding="24dp" android:gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content"> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" - android:paddingBottom="8dp" + android:paddingBottom="20dp" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="@string/heavy_weight_switcher_title"/> + + <TextView + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_weight="0" + android:paddingBottom="16dp" + android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/heavy_weight_switcher_text"/> - <ImageView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scaleType="fitXY" - android:src="?android:listDivider" /> - <LinearLayout android:id="@+id/switch_old" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" + android:minHeight="72dp" android:orientation="horizontal" android:background="@android:drawable/list_selector_background" - android:paddingEnd="3dip" - android:paddingStart="3dip" - android:paddingTop="5dip" - android:paddingBottom="14dip" android:gravity="center_vertical" android:focusable="true" > @@ -61,33 +60,16 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" android:singleLine="true" - android:layout_marginBottom="2dip" - android:duplicateParentState="true" /> - <TextView android:id="@+id/old_app_description" - android:layout_marginTop="-4dip" - android:layout_gravity="center_vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" android:duplicateParentState="true" /> </LinearLayout> </LinearLayout> - <ImageView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scaleType="fitXY" - android:src="?android:listDivider" /> - <LinearLayout android:id="@+id/switch_new" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" + android:minHeight="88dp" android:orientation="horizontal" android:background="@android:drawable/list_selector_background" - android:paddingEnd="3dip" - android:paddingStart="3dip" - android:paddingTop="5dip" - android:paddingBottom="8dip" android:gravity="center_vertical" android:focusable="true" > @@ -109,10 +91,10 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" android:singleLine="true" - android:layout_marginBottom="2dip" + android:layout_marginBottom="2dp" android:duplicateParentState="true" /> <TextView android:id="@+id/new_app_description" - android:layout_marginTop="-4dip" + android:layout_marginTop="-4dp" android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -121,25 +103,4 @@ </LinearLayout> </LinearLayout> - <ImageView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scaleType="fitXY" - android:src="?android:listDivider" /> - - <TextView android:id="@+id/cancel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textAppearance="?android:attr/textAppearanceMedium" - android:background="@android:drawable/list_selector_background" - android:paddingEnd="6dip" - android:paddingStart="6dip" - android:paddingTop="5dip" - android:paddingBottom="8dip" - android:textStyle="bold" - android:singleLine="true" - android:gravity="center" - android:focusable="true" - android:text="@string/cancel" /> - </LinearLayout> diff --git a/data/res/layout/notification_material_action_list.xml b/data/res/layout/notification_material_action_list.xml index 49b0ee79..07559f43 100644 --- a/data/res/layout/notification_material_action_list.xml +++ b/data/res/layout/notification_material_action_list.xml @@ -24,11 +24,9 @@ android:layout_width="match_parent" android:layout_height="@dimen/notification_action_list_height" android:paddingEnd="12dp" - android:paddingStart="8dp" android:orientation="horizontal" android:gravity="center_vertical" android:visibility="gone" - android:background="@color/notification_action_list" > <!-- actions will be added here --> </com.android.internal.widget.NotificationActionListLayout> diff --git a/data/res/layout/notification_material_reply_text.xml b/data/res/layout/notification_material_reply_text.xml index bc22eb49..84603b06 100644 --- a/data/res/layout/notification_material_reply_text.xml +++ b/data/res/layout/notification_material_reply_text.xml @@ -28,7 +28,8 @@ android:layout_width="match_parent" android:layout_height="1dip" android:id="@+id/action_divider" - android:layout_marginBottom="15dp" + android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginBottom="@dimen/notification_content_margin" android:background="@drawable/notification_template_divider" /> <TextView @@ -53,7 +54,6 @@ android:id="@+id/notification_material_reply_text_1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="15dp" android:layout_marginEnd="@dimen/notification_content_margin_end" android:textAppearance="@style/TextAppearance.Material.Notification.Reply" android:singleLine="true" /> diff --git a/data/res/layout/notification_template_header.xml b/data/res/layout/notification_template_header.xml index 20bdf3fe..3196d000 100644 --- a/data/res/layout/notification_template_header.xml +++ b/data/res/layout/notification_template_header.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - +<!-- extends ViewGroup --> <NotificationHeaderView xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/Theme.Material.Notification" @@ -126,5 +126,42 @@ android:visibility="gone" android:contentDescription="@string/notification_work_profile_content_description" /> + + <LinearLayout + android:id="@+id/app_ops" + android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_marginStart="6dp" + android:orientation="horizontal" > + <ImageButton + android:id="@+id/camera" + android:layout_width="?attr/notificationHeaderIconSize" + android:layout_height="?attr/notificationHeaderIconSize" + android:src="@drawable/ic_camera" + android:tint="@color/notification_secondary_text_color_light" + android:background="?android:selectableItemBackgroundBorderless" + android:visibility="gone" + /> + <ImageButton + android:id="@+id/mic" + android:layout_width="?attr/notificationHeaderIconSize" + android:layout_height="?attr/notificationHeaderIconSize" + android:src="@drawable/ic_mic" + android:tint="@color/notification_secondary_text_color_light" + android:background="?android:selectableItemBackgroundBorderless" + android:layout_marginStart="4dp" + android:visibility="gone" + /> + <ImageButton + android:id="@+id/overlay" + android:layout_width="?attr/notificationHeaderIconSize" + android:layout_height="?attr/notificationHeaderIconSize" + android:src="@drawable/ic_alert_window_layer" + android:tint="@color/notification_secondary_text_color_light" + android:background="?android:selectableItemBackgroundBorderless" + android:layout_marginStart="4dp" + android:visibility="gone" + /> + </LinearLayout> </NotificationHeaderView> diff --git a/data/res/layout/notification_template_material_ambient.xml b/data/res/layout/notification_template_material_ambient.xml index 19c4d235..fdc9f017 100644 --- a/data/res/layout/notification_template_material_ambient.xml +++ b/data/res/layout/notification_template_material_ambient.xml @@ -43,6 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" + android:layout_weight="1" android:paddingStart="@dimen/notification_content_margin_start" android:paddingEnd="@dimen/notification_content_margin_end" android:clipToPadding="false" @@ -51,6 +52,7 @@ > <TextView android:id="@+id/title" android:textAppearance="@style/TextAppearance.Material.Notification.Title" + android:fontFamily="sans-serif" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="top|center_horizontal" @@ -75,20 +77,19 @@ android:maxLines="3" /> </LinearLayout> + <FrameLayout android:id="@+id/actions_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom"> + <com.android.internal.widget.NotificationActionListLayout + android:id="@+id/actions" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_action_list_height" + android:paddingEnd="4dp" + android:orientation="horizontal" + android:gravity="center" + android:visibility="gone" + /> + </FrameLayout> </LinearLayout> - <FrameLayout android:id="@+id/actions_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom"> - <com.android.internal.widget.NotificationActionListLayout - android:id="@+id/actions" - android:layout_width="match_parent" - android:layout_height="@dimen/notification_action_list_height" - android:paddingEnd="4dp" - android:orientation="horizontal" - android:gravity="center" - android:visibility="gone" - android:background="@color/notification_action_list" - /> - </FrameLayout> </FrameLayout> diff --git a/data/res/layout/notification_template_material_base.xml b/data/res/layout/notification_template_material_base.xml index 445b19b5..221bcf6a 100644 --- a/data/res/layout/notification_template_material_base.xml +++ b/data/res/layout/notification_template_material_base.xml @@ -30,7 +30,7 @@ android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" android:layout_marginTop="@dimen/notification_content_margin_top" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" + android:layout_marginBottom="@dimen/notification_content_margin" android:orientation="vertical" > <include layout="@layout/notification_template_part_line1" /> <include layout="@layout/notification_template_text" /> @@ -42,7 +42,7 @@ <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin_bottom" /> + android:layout_marginTop="@dimen/notification_content_margin" /> </LinearLayout> <include layout="@layout/notification_template_right_icon" /> </FrameLayout> diff --git a/data/res/layout/notification_template_material_big_base.xml b/data/res/layout/notification_template_material_big_base.xml index d47bff64..21068908 100644 --- a/data/res/layout/notification_template_material_big_base.xml +++ b/data/res/layout/notification_template_material_big_base.xml @@ -20,6 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:clipChildren="false" android:tag="big" > <LinearLayout android:id="@+id/notification_action_list_margin_target" @@ -30,6 +31,7 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_weight="1" android:layout_gravity="top" > <include layout="@layout/notification_template_header" /> <LinearLayout @@ -39,7 +41,6 @@ android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" android:layout_marginTop="@dimen/notification_content_margin_top" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" android:orientation="vertical" > <include layout="@layout/notification_template_part_line1" /> <include layout="@layout/notification_template_text" /> @@ -61,7 +62,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" /> + android:layout_marginTop="@dimen/notification_content_margin" /> + <include layout="@layout/notification_material_action_list" /> </LinearLayout> - <include layout="@layout/notification_material_action_list" /> </FrameLayout> diff --git a/data/res/layout/notification_template_material_big_media.xml b/data/res/layout/notification_template_material_big_media.xml index cc4dd387..b4e26483 100644 --- a/data/res/layout/notification_template_material_big_media.xml +++ b/data/res/layout/notification_template_material_big_media.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/notification_content_margin_top" android:layout_marginStart="@dimen/notification_content_margin_start" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" + android:layout_marginBottom="@dimen/notification_content_margin" android:layout_marginEnd="@dimen/notification_content_margin_end" android:minHeight="@dimen/notification_min_content_height" android:orientation="vertical" diff --git a/data/res/layout/notification_template_material_big_picture.xml b/data/res/layout/notification_template_material_big_picture.xml index 76c0a676..7a1cc1ef 100644 --- a/data/res/layout/notification_template_material_big_picture.xml +++ b/data/res/layout/notification_template_material_big_picture.xml @@ -20,17 +20,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:tag="bigPicture" + android:clipChildren="false" > <include layout="@layout/notification_template_header" /> <include layout="@layout/notification_template_right_icon" /> <LinearLayout + android:id="@+id/notification_action_list_margin_target" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="top" android:layout_marginTop="@dimen/notification_content_margin_top" android:clipToPadding="false" android:orientation="vertical" - android:id="@+id/notification_action_list_margin_target" > <LinearLayout android:id="@+id/notification_main_column" @@ -53,7 +54,6 @@ android:adjustViewBounds="true" android:layout_weight="1" android:layout_marginTop="13dp" - android:layout_marginBottom="16dp" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" android:scaleType="centerCrop" @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" /> + android:layout_marginTop="@dimen/notification_content_margin" /> + <include layout="@layout/notification_material_action_list" /> </LinearLayout> - <include layout="@layout/notification_material_action_list" /> </FrameLayout> diff --git a/data/res/layout/notification_template_material_big_text.xml b/data/res/layout/notification_template_material_big_text.xml index ac4c052d..3a6f5733 100644 --- a/data/res/layout/notification_template_material_big_text.xml +++ b/data/res/layout/notification_template_material_big_text.xml @@ -19,6 +19,7 @@ android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:clipChildren="false" android:tag="bigText" > <include layout="@layout/notification_template_header" /> @@ -43,6 +44,7 @@ android:clipToPadding="false" android:minHeight="@dimen/notification_min_content_height" android:orientation="vertical" + android:layout_weight="1" > <include layout="@layout/notification_template_part_line1" /> <include layout="@layout/notification_template_progress" @@ -54,7 +56,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/notification_text_margin_top" - android:paddingBottom="@dimen/notification_content_margin_bottom" android:textAppearance="@style/TextAppearance.Material.Notification" android:singleLine="false" android:gravity="top" @@ -68,12 +69,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> <include layout="@layout/notification_template_smart_reply_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/notification_content_margin_start" - android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/notification_content_margin_start" + android:layout_marginEnd="@dimen/notification_content_margin_end" + android:layout_marginTop="@dimen/notification_content_margin" /> + <include layout="@layout/notification_material_action_list" /> </LinearLayout> - <include layout="@layout/notification_material_action_list" /> <include layout="@layout/notification_template_right_icon" /> </FrameLayout> diff --git a/data/res/layout/notification_template_material_inbox.xml b/data/res/layout/notification_template_material_inbox.xml index 718cf16a..23d87991 100644 --- a/data/res/layout/notification_template_material_inbox.xml +++ b/data/res/layout/notification_template_material_inbox.xml @@ -20,6 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:tag="inbox" + android:clipChildren="false" > <include layout="@layout/notification_template_header" /> <LinearLayout @@ -38,8 +39,8 @@ android:layout_gravity="top" android:paddingStart="@dimen/notification_content_margin_start" android:paddingEnd="@dimen/notification_content_margin_end" - android:paddingBottom="@dimen/notification_content_margin_bottom" android:minHeight="@dimen/notification_min_content_height" + android:layout_weight="1" android:clipToPadding="false" android:orientation="vertical" > @@ -124,8 +125,8 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" /> + android:layout_marginTop="@dimen/notification_content_margin" /> + <include layout="@layout/notification_material_action_list" /> </LinearLayout> - <include layout="@layout/notification_material_action_list" /> <include layout="@layout/notification_template_right_icon" /> </FrameLayout> diff --git a/data/res/layout/notification_template_material_media.xml b/data/res/layout/notification_template_material_media.xml index 2c69b90c..3a0912bd 100644 --- a/data/res/layout/notification_template_material_media.xml +++ b/data/res/layout/notification_template_material_media.xml @@ -49,7 +49,7 @@ android:layout_gravity="fill_vertical" android:layout_weight="1" android:minHeight="@dimen/notification_min_content_height" - android:paddingBottom="@dimen/notification_content_margin_bottom" + android:paddingBottom="@dimen/notification_content_margin" android:orientation="vertical" > <include layout="@layout/notification_template_part_line1"/> diff --git a/data/res/layout/notification_template_material_messaging.xml b/data/res/layout/notification_template_material_messaging.xml index 34f5ae81..53514a34 100644 --- a/data/res/layout/notification_template_material_messaging.xml +++ b/data/res/layout/notification_template_material_messaging.xml @@ -19,10 +19,11 @@ android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:clipChildren="false" android:tag="messaging" > <include layout="@layout/notification_template_header"/> - <LinearLayout + <com.android.internal.widget.RemeasuringLinearLayout android:id="@+id/notification_action_list_margin_target" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -31,15 +32,15 @@ android:clipToPadding="false" android:orientation="vertical"> - <LinearLayout + <com.android.internal.widget.RemeasuringLinearLayout android:id="@+id/notification_main_column" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" + android:layout_weight="1" android:layout_marginStart="@dimen/notification_content_margin_start" android:layout_marginEnd="@dimen/notification_content_margin_end" android:minHeight="@dimen/notification_min_content_height" - android:layout_marginBottom="@dimen/notification_content_margin_bottom" android:orientation="vertical" > <com.android.internal.widget.MessagingLinearLayout @@ -47,12 +48,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:spacing="@dimen/notification_messaging_spacing" /> - <include layout="@layout/notification_template_smart_reply_container" + </com.android.internal.widget.RemeasuringLinearLayout> + <include layout="@layout/notification_template_smart_reply_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/notification_content_margin_bottom" /> - </LinearLayout> - </LinearLayout> - <include layout="@layout/notification_material_action_list" /> + android:layout_marginTop="@dimen/notification_content_margin" /> + <include layout="@layout/notification_material_action_list" /> + </com.android.internal.widget.RemeasuringLinearLayout> <include layout="@layout/notification_template_right_icon"/> </com.android.internal.widget.MessagingLayout> diff --git a/data/res/layout/shutdown_dialog.xml b/data/res/layout/shutdown_dialog.xml index 398bfb18..2d214b32 100644 --- a/data/res/layout/shutdown_dialog.xml +++ b/data/res/layout/shutdown_dialog.xml @@ -29,7 +29,7 @@ <TextView android:id="@id/text1" android:layout_width="wrap_content" - android:layout_height="32dp" + android:layout_height="32sp" android:text="@string/shutdown_progress" android:textDirection="locale" android:textSize="24sp" |