summaryrefslogtreecommitdiff
path: root/data/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'data/res/layout')
-rw-r--r--data/res/layout/chooser_dialog.xml60
-rw-r--r--data/res/layout/chooser_dialog_item.xml45
-rw-r--r--data/res/layout/chooser_grid_preview_text.xml4
-rw-r--r--data/res/layout/chooser_list_per_profile.xml4
-rw-r--r--data/res/layout/notification_material_action_list.xml3
-rw-r--r--data/res/layout/notification_template_material_conversation.xml32
-rw-r--r--data/res/layout/resolve_grid_item.xml2
-rw-r--r--data/res/layout/resolver_empty_states.xml6
-rw-r--r--data/res/layout/resolver_list.xml4
9 files changed, 141 insertions, 19 deletions
diff --git a/data/res/layout/chooser_dialog.xml b/data/res/layout/chooser_dialog.xml
new file mode 100644
index 0000000..824136c
--- /dev/null
+++ b/data/res/layout/chooser_dialog.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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:background="@drawable/chooser_dialog_background"
+ android:orientation="vertical"
+ android:paddingBottom="8dp"
+ android:paddingTop="8dp"
+ android:layout_width="240dp"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:gravity="start|center_vertical"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:minHeight="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView android:id="@+id/icon"
+ android:layout_marginEnd="16dp"
+ android:layout_width="24dp"
+ android:layout_height="24dp"/>
+
+ <TextView android:id="@+id/title"
+ android:textSize="16sp"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.WindowTitle"
+ android:text="App name"
+ android:lines="1"
+ android:ellipsize="end"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+
+ <com.android.internal.widget.RecyclerView
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ app:layoutManager="com.android.internal.widget.LinearLayoutManager"
+ android:id="@+id/listContainer"
+ android:overScrollMode="never"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/data/res/layout/chooser_dialog_item.xml b/data/res/layout/chooser_dialog_item.xml
new file mode 100644
index 0000000..4a88bb0
--- /dev/null
+++ b/data/res/layout/chooser_dialog_item.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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:background="?android:attr/selectableItemBackground"
+ android:clickable="true"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:orientation="horizontal"
+ android:gravity="start|center_vertical"
+ android:minHeight="56dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView android:id="@+id/icon"
+ android:alpha="0.54"
+ android:tint="?android:attr/textColorPrimary"
+ android:layout_marginEnd="16dp"
+ android:layout_width="24dp"
+ android:layout_height="24dp"/>
+
+ <TextView android:id="@+id/text"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+
+</LinearLayout> \ No newline at end of file
diff --git a/data/res/layout/chooser_grid_preview_text.xml b/data/res/layout/chooser_grid_preview_text.xml
index 0029174..1d18648 100644
--- a/data/res/layout/chooser_grid_preview_text.xml
+++ b/data/res/layout/chooser_grid_preview_text.xml
@@ -44,6 +44,8 @@
android:ellipsize="end"
android:fontFamily="@android:string/config_headlineFontFamily"
android:textColor="?android:attr/textColorPrimary"
+ android:textAlignment="gravity"
+ android:textDirection="locale"
android:maxLines="2"
android:focusable="true"/>
@@ -90,6 +92,8 @@
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:maxLines="2"
+ android:textAlignment="gravity"
+ android:textDirection="locale"
android:textAppearance="@style/TextAppearance.DeviceDefault.WindowTitle"
android:fontFamily="@android:string/config_headlineFontFamily"/>
</LinearLayout>
diff --git a/data/res/layout/chooser_list_per_profile.xml b/data/res/layout/chooser_list_per_profile.xml
index 6b1b002..86dc71c 100644
--- a/data/res/layout/chooser_list_per_profile.xml
+++ b/data/res/layout/chooser_list_per_profile.xml
@@ -20,7 +20,7 @@
<com.android.internal.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layoutManager="com.android.internal.widget.GridLayoutManager"
+ android:layoutManager="com.android.internal.app.ChooserGridLayoutManager"
android:id="@+id/resolver_list"
android:clipToPadding="false"
android:background="?attr/colorBackgroundFloating"
@@ -29,4 +29,4 @@
android:nestedScrollingEnabled="true" />
<include layout="@layout/resolver_empty_states" />
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
diff --git a/data/res/layout/notification_material_action_list.xml b/data/res/layout/notification_material_action_list.xml
index ec54091..3615b9e 100644
--- a/data/res/layout/notification_material_action_list.xml
+++ b/data/res/layout/notification_material_action_list.xml
@@ -22,10 +22,11 @@
android:layout_gravity="bottom">
<LinearLayout
+ android:id="@+id/actions_container_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingEnd="12dp"
+ android:paddingEnd="@dimen/bubble_gone_padding_end"
>
<com.android.internal.widget.NotificationActionListLayout
diff --git a/data/res/layout/notification_template_material_conversation.xml b/data/res/layout/notification_template_material_conversation.xml
index 9a9d8b9..139185f 100644
--- a/data/res/layout/notification_template_material_conversation.xml
+++ b/data/res/layout/notification_template_material_conversation.xml
@@ -38,6 +38,8 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:clipChildren="false"
+ android:clipToPadding="false"
android:layout_gravity="top|center_horizontal"
>
@@ -63,13 +65,17 @@
android:layout_height="@dimen/conversation_icon_size_badged"
android:layout_marginLeft="@dimen/conversation_badge_side_margin"
android:layout_marginTop="@dimen/conversation_badge_side_margin"
+ android:clipChildren="false"
+ android:clipToPadding="false"
>
<com.android.internal.widget.CachingIconView
android:id="@+id/conversation_icon_badge_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_gravity="center"
android:src="@drawable/conversation_badge_background"
android:forceHasOverlappingRendering="false"
+ android:scaleType="center"
/>
<com.android.internal.widget.CachingIconView
android:id="@+id/icon"
@@ -81,11 +87,14 @@
/>
<com.android.internal.widget.CachingIconView
android:id="@+id/conversation_icon_badge_ring"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:src="@drawable/conversation_badge_ring"
android:visibility="gone"
android:forceHasOverlappingRendering="false"
+ android:clipToPadding="false"
+ android:scaleType="center"
/>
</FrameLayout>
</FrameLayout>
@@ -132,21 +141,20 @@
android:id="@+id/conversation_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/notification_header_separating_margin"
+ android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"
android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Title"
android:textSize="16sp"
android:singleLine="true"
android:layout_weight="1"
/>
-
<TextView
android:id="@+id/app_name_divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?attr/notificationHeaderTextAppearance"
- android:layout_marginStart="@dimen/notification_header_separating_margin"
- android:layout_marginEnd="@dimen/notification_header_separating_margin"
+ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"
+ android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"
android:text="@string/notification_header_divider_symbol"
android:layout_gravity="center"
android:paddingTop="1sp"
@@ -161,9 +169,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_marginStart="@dimen/notification_header_separating_margin"
+ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"
+ android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"
android:paddingTop="1sp"
android:singleLine="true"
+ android:visibility="gone"
/>
<TextView
@@ -171,8 +181,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?attr/notificationHeaderTextAppearance"
- android:layout_marginStart="@dimen/notification_header_separating_margin"
- android:layout_marginEnd="@dimen/notification_header_separating_margin"
+ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"
+ android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin"
android:text="@string/notification_header_divider_symbol"
android:layout_gravity="center"
android:paddingTop="1sp"
@@ -182,11 +192,11 @@
<DateTimeView
android:id="@+id/time"
- android:textAppearance="@style/TextAppearance.Material.Notification.Time"
+ android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_marginStart="@dimen/notification_header_separating_margin"
+ android:layout_marginStart="@dimen/notification_conversation_header_separating_margin"
android:paddingTop="1sp"
android:showRelative="true"
android:singleLine="true"
diff --git a/data/res/layout/resolve_grid_item.xml b/data/res/layout/resolve_grid_item.xml
index fdd965f..50e6f33 100644
--- a/data/res/layout/resolve_grid_item.xml
+++ b/data/res/layout/resolve_grid_item.xml
@@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:textAppearance="?attr/textAppearanceSmall"
android:textColor="?attr/textColorPrimary"
- android:textSize="14sp"
+ android:textSize="12sp"
android:gravity="top|center_horizontal"
android:lines="1"
android:ellipsize="end" />
diff --git a/data/res/layout/resolver_empty_states.xml b/data/res/layout/resolver_empty_states.xml
index fe11769..bdcfeb2 100644
--- a/data/res/layout/resolver_empty_states.xml
+++ b/data/res/layout/resolver_empty_states.xml
@@ -27,8 +27,8 @@
android:id="@+id/resolver_empty_state_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="48dp"
- android:paddingBottom="48dp"
+ android:paddingTop="@dimen/resolver_empty_state_container_padding_top"
+ android:paddingBottom="@dimen/resolver_empty_state_container_padding_bottom"
android:gravity="center_horizontal">
<ImageView
android:id="@+id/resolver_empty_state_icon"
@@ -59,7 +59,7 @@
<Button
android:id="@+id/resolver_empty_state_button"
android:layout_below="@+id/resolver_empty_state_subtitle"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="8dp"
android:text="@string/resolver_switch_on_work"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/data/res/layout/resolver_list.xml b/data/res/layout/resolver_list.xml
index 4d0837f..6fde1df 100644
--- a/data/res/layout/resolver_list.xml
+++ b/data/res/layout/resolver_list.xml
@@ -26,6 +26,7 @@
android:id="@id/contentPanel">
<RelativeLayout
+ android:id="@+id/title_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alwaysShow="true"
@@ -33,7 +34,7 @@
android:paddingTop="@dimen/resolver_small_margin"
android:paddingStart="@dimen/resolver_edge_margin"
android:paddingEnd="@dimen/resolver_edge_margin"
- android:paddingBottom="@dimen/resolver_edge_margin"
+ android:paddingBottom="@dimen/resolver_title_padding_bottom"
android:background="@drawable/bottomsheet_background">
<TextView
@@ -83,6 +84,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
+ android:accessibilityTraversalAfter="@id/title"
android:background="?attr/colorBackgroundFloating">
<LinearLayout
android:orientation="vertical"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 19:16:13 +0000