diff options
Diffstat (limited to 'data/res/layout')
17 files changed, 139 insertions, 174 deletions
diff --git a/data/res/layout/autofill_dataset_picker.xml b/data/res/layout/autofill_dataset_picker.xml index ef19f870..a88836ef 100644 --- a/data/res/layout/autofill_dataset_picker.xml +++ b/data/res/layout/autofill_dataset_picker.xml @@ -14,8 +14,7 @@ limitations under the License. --> -<view xmlns:android="http://schemas.android.com/apk/res/android" - class="com.android.server.autofill.ui.FillUi$AutofillFrameLayout" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/autofill_dataset_picker" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -31,4 +30,4 @@ android:visibility="gone"> </ListView> -</view> +</FrameLayout> diff --git a/data/res/layout/autofill_dataset_picker_fullscreen.xml b/data/res/layout/autofill_dataset_picker_fullscreen.xml index 07298c18..1d2b5e5d 100644 --- a/data/res/layout/autofill_dataset_picker_fullscreen.xml +++ b/data/res/layout/autofill_dataset_picker_fullscreen.xml @@ -14,35 +14,73 @@ 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" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:background="?android:attr/windowBackground" + android:paddingStart="40dp" + android:paddingEnd="40dp" + android:paddingTop="40dp" + android:paddingBottom="40dp"> + + <LinearLayout + android:orientation="vertical" + android:layout_width="0dp" 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"/> + android:layout_weight="1" + android:layout_marginEnd="32dp"> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="6dp" + > + <ImageView + android:id="@+id/autofill_dataset_icon" + android:scaleType="fitStart" + android:layout_marginEnd="10dp" + android:layout_gravity="center_vertical" + android:layout_width="48dp" + android:layout_height="48dp"/> + <TextView + android:id="@+id/autofill_dataset_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textSize="24sp" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/autofill_dataset_header" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"/> + + </LinearLayout> <!-- 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" + autofill_dataset_list, autofill_dataset_foolter--> + <LinearLayout + android:layout_width="304dp" android:layout_height="wrap_content" - android:layout_centerInParent="true"> + android:id="@+id/autofill_dataset_picker" + android:orientation="vertical"> <ListView android:id="@+id/autofill_dataset_list" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" android:divider="@null" android:drawSelectorOnTop="true" android:visibility="gone"/> - </FrameLayout> + <LinearLayout + android:id="@+id/autofill_dataset_footer" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"/> + </LinearLayout> -</RelativeLayout> +</LinearLayout>
\ No newline at end of file diff --git a/data/res/layout/autofill_dataset_picker_header_footer.xml b/data/res/layout/autofill_dataset_picker_header_footer.xml index 048494ac..093f035e 100644 --- a/data/res/layout/autofill_dataset_picker_header_footer.xml +++ b/data/res/layout/autofill_dataset_picker_header_footer.xml @@ -14,8 +14,7 @@ limitations under the License. --> -<view xmlns:android="http://schemas.android.com/apk/res/android" - class="com.android.server.autofill.ui.FillUi$AutofillFrameLayout" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/autofill_dataset_picker" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -54,4 +53,4 @@ </LinearLayout> -</view> +</FrameLayout> diff --git a/data/res/layout/autofill_dataset_picker_header_footer_fullscreen.xml b/data/res/layout/autofill_dataset_picker_header_footer_fullscreen.xml deleted file mode 100644 index 24b14a06..00000000 --- a/data/res/layout/autofill_dataset_picker_header_footer_fullscreen.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?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"> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/autofill_dataset_header" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"/> - - <ListView - android:id="@+id/autofill_dataset_list" - android:layout_weight="1" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:clickable="true" - android:divider="@null" - android:drawSelectorOnTop="true" - android:visibility="gone"/> - - <LinearLayout - android:id="@+id/autofill_dataset_footer" - android:visibility="gone" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"/> - - </LinearLayout> - - </FrameLayout> - -</RelativeLayout> diff --git a/data/res/layout/choose_account_row.xml b/data/res/layout/choose_account_row.xml index 71537fba..81bca213 100644 --- a/data/res/layout/choose_account_row.xml +++ b/data/res/layout/choose_account_row.xml @@ -23,8 +23,8 @@ android:orientation="horizontal" > <ImageView android:id="@+id/account_row_icon" - android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_width="?attr/listPreferredItemHeight" + android:layout_height="?attr/listPreferredItemHeight" android:paddingEnd="8dip" /> <TextView xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/data/res/layout/global_actions_item.xml b/data/res/layout/global_actions_item.xml index e5a9854d..6ac0b175 100644 --- a/data/res/layout/global_actions_item.xml +++ b/data/res/layout/global_actions_item.xml @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- Used with LegacyGlobalActions. --> <!-- RelativeLayouts have an issue enforcing minimum heights, so just work around this for now with LinearLayouts. --> diff --git a/data/res/layout/magnifier.xml b/data/res/layout/magnifier.xml deleted file mode 100644 index f3344c74..00000000 --- a/data/res/layout/magnifier.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2017 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 - --> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/magnifier_inner" - android:layout_width="@android:dimen/magnifier_width" - android:layout_height="@android:dimen/magnifier_height" - android:elevation="@android:dimen/magnifier_elevation" - android:background="?android:attr/floatingToolbarPopupBackgroundDrawable" - android:scaleType="fitXY"> - <ImageView - android:id="@+id/magnifier_image" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </LinearLayout> -</LinearLayout> diff --git a/data/res/layout/notification_material_action_tombstone.xml b/data/res/layout/notification_material_action_tombstone.xml index 817f298f..9fa7c6a2 100644 --- a/data/res/layout/notification_material_action_tombstone.xml +++ b/data/res/layout/notification_material_action_tombstone.xml @@ -27,7 +27,7 @@ android:singleLine="true" android:ellipsize="end" android:textAlignment="viewStart" - android:alpha="0.5" + android:alpha="@dimen/notification_action_disabled_alpha" android:enabled="false" android:background="@drawable/notification_material_action_background" /> diff --git a/data/res/layout/notification_material_reply_text.xml b/data/res/layout/notification_material_reply_text.xml index 84603b06..71632a20 100644 --- a/data/res/layout/notification_material_reply_text.xml +++ b/data/res/layout/notification_material_reply_text.xml @@ -30,6 +30,7 @@ android:id="@+id/action_divider" android:layout_marginTop="@dimen/notification_content_margin" android:layout_marginBottom="@dimen/notification_content_margin" + android:layout_marginEnd="@dimen/notification_content_margin_end" android:background="@drawable/notification_template_divider" /> <TextView @@ -50,12 +51,29 @@ android:textAppearance="@style/TextAppearance.Material.Notification.Reply" android:singleLine="true" /> - <TextView - android:id="@+id/notification_material_reply_text_1" + <LinearLayout + android:id="@+id/notification_material_reply_text_1_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/notification_content_margin_end" - android:textAppearance="@style/TextAppearance.Material.Notification.Reply" - android:singleLine="true" /> + android:orientation="horizontal" + android:layout_marginEnd="@dimen/notification_content_margin_end"> + <TextView + android:id="@+id/notification_material_reply_text_1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginEnd="@dimen/notification_content_margin_end" + android:layout_gravity="center" + android:textAppearance="@style/TextAppearance.Material.Notification.Reply" + android:singleLine="true" /> + <ProgressBar + android:id="@+id/notification_material_reply_progress" + android:layout_height="@dimen/messaging_group_sending_progress_size" + android:layout_width="@dimen/messaging_group_sending_progress_size" + android:layout_marginStart="@dimen/notification_content_margin_start" + android:layout_gravity="center" + android:indeterminate="true" + style="?android:attr/progressBarStyleSmall" /> + </LinearLayout> </LinearLayout> diff --git a/data/res/layout/notification_template_material_big_text.xml b/data/res/layout/notification_template_material_big_text.xml index 3a6f5733..26eb4e7b 100644 --- a/data/res/layout/notification_template_material_big_text.xml +++ b/data/res/layout/notification_template_material_big_text.xml @@ -24,7 +24,7 @@ > <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="match_parent" @@ -34,7 +34,7 @@ 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" @@ -53,16 +53,16 @@ android:layout_marginTop="@dimen/notification_progress_margin_top" android:layout_marginBottom="6dp"/> <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/notification_text_margin_top" - android:textAppearance="@style/TextAppearance.Material.Notification" android:singleLine="false" android:gravity="top" android:visibility="gone" android:textAlignment="viewStart" /> - </LinearLayout> + </com.android.internal.widget.RemeasuringLinearLayout> <ViewStub android:layout="@layout/notification_material_reply_text" android:id="@+id/notification_material_reply_container" @@ -75,6 +75,6 @@ android:layout_marginEnd="@dimen/notification_content_margin_end" android:layout_marginTop="@dimen/notification_content_margin" /> <include layout="@layout/notification_material_action_list" /> - </LinearLayout> + </com.android.internal.widget.RemeasuringLinearLayout> <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 23d87991..d6f0e1df 100644 --- a/data/res/layout/notification_template_material_inbox.xml +++ b/data/res/layout/notification_template_material_inbox.xml @@ -53,7 +53,7 @@ android:layout_marginTop="@dimen/notification_progress_margin_top" android:layout_marginBottom="2dp"/> <TextView android:id="@+id/inbox_text0" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -62,7 +62,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text1" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -71,7 +71,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text2" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -80,7 +80,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text3" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -89,7 +89,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text4" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -98,7 +98,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text5" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -107,7 +107,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text6" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" diff --git a/data/res/layout/notification_template_material_messaging.xml b/data/res/layout/notification_template_material_messaging.xml index 53514a34..10c75097 100644 --- a/data/res/layout/notification_template_material_messaging.xml +++ b/data/res/layout/notification_template_material_messaging.xml @@ -52,7 +52,9 @@ <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" /> + android:layout_marginTop="@dimen/notification_content_margin" + android:layout_marginStart="@dimen/notification_content_margin_start" + android:layout_marginEnd="@dimen/notification_content_margin_end" /> <include layout="@layout/notification_material_action_list" /> </com.android.internal.widget.RemeasuringLinearLayout> <include layout="@layout/notification_template_right_icon"/> diff --git a/data/res/layout/notification_template_messaging_group.xml b/data/res/layout/notification_template_messaging_group.xml index bd1030ee..0717d962 100644 --- a/data/res/layout/notification_template_messaging_group.xml +++ b/data/res/layout/notification_template_messaging_group.xml @@ -36,13 +36,14 @@ android:id="@+id/message_name" style="@style/Widget.Material.Notification.MessagingName" android:layout_width="wrap_content" + android:textAlignment="viewStart" /> <com.android.internal.widget.MessagingLinearLayout android:id="@+id/group_message_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:spacing="2dp" - android:layout_weight="1"/> + android:layout_marginTop="@dimen/notification_text_margin_top" + android:spacing="2dp"/> </com.android.internal.widget.RemeasuringLinearLayout> <FrameLayout android:id="@+id/messaging_group_icon_container" @@ -50,4 +51,19 @@ android:layout_height="@dimen/messaging_avatar_size" android:layout_marginStart="12dp" android:visibility="gone"/> + <FrameLayout + android:id="@+id/messaging_group_sending_progress_container" + android:layout_width="@dimen/messaging_group_sending_progress_size" + android:layout_height="@dimen/messaging_avatar_size" + android:layout_marginStart="12dp" + android:layout_gravity="top" + android:visibility="gone"> + <ProgressBar + android:id="@+id/messaging_group_sending_progress" + android:layout_height="@dimen/messaging_group_sending_progress_size" + android:layout_width="@dimen/messaging_group_sending_progress_size" + android:layout_gravity="center" + android:indeterminate="true" + style="?android:attr/progressBarStyleSmall" /> + </FrameLayout> </com.android.internal.widget.MessagingGroup> diff --git a/data/res/layout/notification_template_messaging_text_message.xml b/data/res/layout/notification_template_messaging_text_message.xml index e728e691..3611186e 100644 --- a/data/res/layout/notification_template_messaging_text_message.xml +++ b/data/res/layout/notification_template_messaging_text_message.xml @@ -17,5 +17,6 @@ <com.android.internal.widget.MessagingTextMessage xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/message_text" + android:textAlignment="viewStart" style="@style/Widget.Material.Notification.MessagingText" /> diff --git a/data/res/layout/notification_template_part_line1.xml b/data/res/layout/notification_template_part_line1.xml index ca35de39..6459bb80 100644 --- a/data/res/layout/notification_template_part_line1.xml +++ b/data/res/layout/notification_template_part_line1.xml @@ -31,7 +31,7 @@ android:textAlignment="viewStart" /> <TextView android:id="@+id/text_line_1" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="end|bottom" diff --git a/data/res/layout/notification_template_right_icon.xml b/data/res/layout/notification_template_right_icon.xml index 0b97e45b..ee416ad3 100644 --- a/data/res/layout/notification_template_right_icon.xml +++ b/data/res/layout/notification_template_right_icon.xml @@ -14,30 +14,29 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<!-- The view only has 8dp padding at the end instead of notification_content_margin_end, + since the reply icon has an inset of 8dp and we want it to visually start at the start of the + icon. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/right_icon_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/notification_content_margin_top" + android:layout_marginEnd="8dp" android:layout_gravity="top|end"> <ImageView android:id="@+id/right_icon" android:layout_width="@dimen/notification_right_icon_size" android:layout_height="@dimen/notification_right_icon_size" android:layout_gravity="top|end" - android:layout_marginEnd="@dimen/notification_content_margin_end" + android:layout_marginEnd="8dp" android:scaleType="centerCrop" android:importantForAccessibility="no" /> - <ImageButton android:id="@+id/reply_icon_action" - android:layout_width="16dp" - android:layout_height="16dp" - android:layout_gravity="top|end" - android:layout_marginTop="27dp" - android:layout_marginEnd="16dp" - android:background="@drawable/notification_reply_background" - android:src="@drawable/ic_reply_notification" - android:scaleType="center" - android:contentDescription="@string/notification_reply_button_accessibility" - visiblity="gone"/> -</FrameLayout> + <ImageView android:id="@+id/reply_icon_action" + android:layout_width="@dimen/notification_right_icon_size" + android:layout_height="@dimen/notification_right_icon_size" + android:layout_gravity="top|end" + android:contentDescription="@string/notification_reply_button_accessibility" + android:scaleType="centerCrop" + android:src="@drawable/ic_reply_notification"/> +</LinearLayout> diff --git a/data/res/layout/notification_template_text.xml b/data/res/layout/notification_template_text.xml index 68f34c8e..3b27666e 100644 --- a/data/res/layout/notification_template_text.xml +++ b/data/res/layout/notification_template_text.xml @@ -15,6 +15,7 @@ ~ limitations under the License --> <com.android.internal.widget.ImageFloatingTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/Widget.Material.Notification.Text" android:id="@+id/text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -25,5 +26,4 @@ android:gravity="top" android:singleLine="true" android:textAlignment="viewStart" - android:textAppearance="@style/TextAppearance.Material.Notification" /> |