summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--java/res/layout/chooser_grid_item.xml10
-rw-r--r--java/res/layout/chooser_grid_item_hover.xml4
-rw-r--r--java/res/layout/chooser_grid_preview_file.xml15
-rw-r--r--java/res/layout/chooser_grid_preview_files_text.xml5
-rw-r--r--java/res/layout/chooser_grid_preview_image.xml3
-rw-r--r--java/res/layout/chooser_grid_preview_text.xml15
-rw-r--r--java/res/layout/chooser_list_per_profile_wrap.xml5
-rw-r--r--java/res/layout/chooser_row.xml4
-rw-r--r--java/res/layout/chooser_row_direct_share.xml2
-rw-r--r--java/res/values/colors.xml12
-rw-r--r--java/res/values/dimens.xml26
11 files changed, 70 insertions, 31 deletions
diff --git a/java/res/layout/chooser_grid_item.xml b/java/res/layout/chooser_grid_item.xml
index b06cf1c9..dd07c4f8 100644
--- a/java/res/layout/chooser_grid_item.xml
+++ b/java/res/layout/chooser_grid_item.xml
@@ -24,8 +24,8 @@
android:layout_height="wrap_content"
android:minHeight="100dp"
android:gravity="top|center_horizontal"
- android:paddingVertical="@dimen/grid_padding"
- android:paddingHorizontal="4dp"
+ android:paddingVertical="@dimen/grid_padding_vertical"
+ android:paddingHorizontal="@dimen/grid_padding_horizontal"
android:focusable="true"
android:background="?android:attr/selectableItemBackgroundBorderless">
@@ -37,7 +37,7 @@
<!-- Size manually tuned to match specs -->
<Space android:layout_width="1dp"
- android:layout_height="7dp"/>
+ android:layout_height="@dimen/chooser_grid_item_space_height"/>
<!-- NOTE: for id/text1 and id/text2 below set the width to match parent as a workaround for
b/269395540 i.e. prevent views bounds change during a transition animation. It does not
@@ -50,7 +50,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@androidprv:color/materialColorOnSurface"
+ android:textColor="@color/chooser_grid_item_text1_color"
android:textSize="@dimen/chooser_grid_target_name_text_size"
android:maxLines="1"
android:ellipsize="end" />
@@ -59,7 +59,7 @@
<TextView android:id="@android:id/text2"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="@dimen/chooser_grid_activity_name_text_size"
- android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
+ android:textColor="@color/chooser_grid_item_text2_color"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="1"
diff --git a/java/res/layout/chooser_grid_item_hover.xml b/java/res/layout/chooser_grid_item_hover.xml
index 4f4cd38c..2bb94990 100644
--- a/java/res/layout/chooser_grid_item_hover.xml
+++ b/java/res/layout/chooser_grid_item_hover.xml
@@ -53,7 +53,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@androidprv:color/materialColorOnSurface"
+ android:textColor="@color/chooser_grid_item_text1_color"
android:textSize="@dimen/chooser_grid_target_name_text_size"
android:maxLines="1"
android:ellipsize="end" />
@@ -62,7 +62,7 @@
<TextView android:id="@android:id/text2"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="@dimen/chooser_grid_activity_name_text_size"
- android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
+ android:textColor="@color/chooser_grid_item_text2_color"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lines="1"
diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml
index 9584ec9a..5be37481 100644
--- a/java/res/layout/chooser_grid_preview_file.xml
+++ b/java/res/layout/chooser_grid_preview_file.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@androidprv:color/materialColorSurfaceContainer">
+ android:background="@color/chooser_grid_preview_background" >
<RelativeLayout
android:layout_width="match_parent"
@@ -32,6 +32,7 @@
android:layout_gravity="center"
android:layout_marginHorizontal="@dimen/chooser_edge_margin_normal"
android:layout_marginBottom="8dp"
+ android:minHeight="@dimen/chooser_content_view_min_height"
android:padding="@dimen/chooser_edge_margin_normal"
android:background="@drawable/chooser_content_preview_rounded"
android:id="@androidprv:id/content_preview_file_layout">
@@ -63,9 +64,9 @@
android:gravity="start|top"
android:singleLine="true"
android:textStyle="bold"
- android:textColor="@androidprv:color/materialColorOnSurface"
- android:textSize="12sp"
- android:lineHeight="16sp"
+ android:textColor="@color/content_preview_filename_text_color"
+ android:textSize="@dimen/content_preview_text_size"
+ android:lineHeight="@dimen/content_preview_filename_line_size"
android:textAppearance="@style/TextAppearance.ChooserDefault"/>
<TextView
@@ -74,9 +75,9 @@
android:layout_height="wrap_content"
android:gravity="start|top"
android:singleLine="true"
- android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
- android:textSize="12sp"
- android:lineHeight="16sp"
+ android:textColor="@color/content_preview_more_files_text_color"
+ android:textSize="@dimen/content_preview_more_files_text_size"
+ android:lineHeight="@dimen/content_preview_more_files_line_size"
android:textAppearance="@style/TextAppearance.ChooserDefault"/>
</LinearLayout>
diff --git a/java/res/layout/chooser_grid_preview_files_text.xml b/java/res/layout/chooser_grid_preview_files_text.xml
index 9e2bde67..b57d1394 100644
--- a/java/res/layout/chooser_grid_preview_files_text.xml
+++ b/java/res/layout/chooser_grid_preview_files_text.xml
@@ -23,13 +23,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@androidprv:color/materialColorSurfaceContainer">
+ android:background="@color/chooser_grid_preview_background">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal"
+ android:minHeight="@dimen/chooser_content_view_min_height"
android:layout_marginBottom="8dp"
android:layout_marginHorizontal="@dimen/chooser_edge_margin_normal"
android:padding="@dimen/chooser_edge_margin_normal_half"
@@ -53,7 +54,7 @@
android:maxLines="@integer/text_preview_lines"
android:ellipsize="end"
android:linksClickable="false"
- android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
+ android:textColor="@color/content_preview_text_color"
android:textAppearance="@style/TextAppearance.ChooserDefault"/>
</LinearLayout>
diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml
index 199963b1..b14f6463 100644
--- a/java/res/layout/chooser_grid_preview_image.xml
+++ b/java/res/layout/chooser_grid_preview_image.xml
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:importantForAccessibility="no"
- android:background="@androidprv:color/materialColorSurfaceContainer">
+ android:background="@color/chooser_grid_preview_background">
<ViewStub
android:id="@+id/chooser_headline_row_stub"
@@ -39,6 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/chooser_preview_image_height_tall"
android:layout_gravity="center_horizontal"
+ android:minHeight="@dimen/chooser_content_view_min_height"
android:layout_marginBottom="8dp"
app:itemInnerSpacing="3dp"
app:itemOuterSpacing="@dimen/chooser_edge_margin_normal"
diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml
index 951abfc7..242b9409 100644
--- a/java/res/layout/chooser_grid_preview_text.xml
+++ b/java/res/layout/chooser_grid_preview_text.xml
@@ -25,14 +25,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@androidprv:color/materialColorSurfaceContainer">
+ android:background="@color/chooser_grid_preview_background">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:minHeight="@dimen/chooser_content_view_min_height"
android:layout_marginHorizontal="@dimen/chooser_edge_margin_normal"
- android:layout_marginBottom="8dp"
+ android:layout_marginBottom="@dimen/chooser_edge_margin_normal_half"
android:paddingVertical="@dimen/chooser_edge_margin_normal_half"
android:paddingStart="@dimen/chooser_edge_margin_normal_half"
android:paddingEnd="0dp"
@@ -67,7 +68,7 @@
android:textAlignment="gravity"
android:textDirection="locale"
android:textStyle="bold"
- android:textColor="@androidprv:color/materialColorOnSurface"
+ android:textColor="@color/content_preview_filename_text_color"
android:fontFamily="@androidprv:string/config_headlineFontFamily"/>
<TextView
@@ -82,7 +83,7 @@
app:layout_goneMarginStart="0dp"
android:ellipsize="end"
android:fontFamily="@androidprv:string/config_headlineFontFamily"
- android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
+ android:textColor="@color/content_preview_text_color"
android:textAlignment="gravity"
android:textDirection="locale"
android:maxLines="@integer/text_preview_lines"
@@ -90,8 +91,8 @@
<FrameLayout
android:id="@+id/copy"
- android:layout_width="48dp"
- android:layout_height="48dp"
+ android:layout_width="@dimen/content_preview_copy_icon_size"
+ android:layout_height="@dimen/content_preview_copy_icon_size"
style="?android:attr/borderlessButtonStyle"
app:layout_constraintStart_toEndOf="@androidprv:id/content_preview_text"
app:layout_constraintEnd_toEndOf="parent"
@@ -105,7 +106,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:tint="@androidprv:color/materialColorOnSurfaceVariant"
+ android:tint="@color/content_preview_copy_icon_tint"
android:src="@androidprv:drawable/ic_menu_copy_material"
/>
</FrameLayout>
diff --git a/java/res/layout/chooser_list_per_profile_wrap.xml b/java/res/layout/chooser_list_per_profile_wrap.xml
index e556bc94..db65533f 100644
--- a/java/res/layout/chooser_list_per_profile_wrap.xml
+++ b/java/res/layout/chooser_list_per_profile_wrap.xml
@@ -18,7 +18,8 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/chooser_list_padding">
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
@@ -26,7 +27,7 @@
app:layoutManager="com.android.intentresolver.ChooserGridLayoutManager"
android:id="@androidprv:id/resolver_list"
android:clipToPadding="false"
- android:background="@androidprv:color/materialColorSurfaceContainer"
+ android:background="@color/chooser_grid_layout_background"
android:scrollbars="none"
android:nestedScrollingEnabled="true" />
diff --git a/java/res/layout/chooser_row.xml b/java/res/layout/chooser_row.xml
index 3fe1ee7d..cb8a53f4 100644
--- a/java/res/layout/chooser_row.xml
+++ b/java/res/layout/chooser_row.xml
@@ -21,7 +21,7 @@
android:id="@+id/suggested_apps_container"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="100dp"
+ android:layout_height="@dimen/chooser_row_height"
android:gravity="start|top">
<TextView
android:id="@androidprv:id/chooser_row_text_option"
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:layout_gravity="center"
- android:textColor="@androidprv:color/materialColorOnSurfaceVariant"
+ android:textColor="@color/chooser_row_text_color"
android:visibility="gone" />
</LinearLayout>
diff --git a/java/res/layout/chooser_row_direct_share.xml b/java/res/layout/chooser_row_direct_share.xml
index 53e666a6..59794191 100644
--- a/java/res/layout/chooser_row_direct_share.xml
+++ b/java/res/layout/chooser_row_direct_share.xml
@@ -20,7 +20,7 @@
android:id="@+id/shortcuts_container"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="200dp">
+ android:layout_height="@dimen/chooser_row_direct_share_height">
</LinearLayout>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 758e403b..966c2d28 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -17,7 +17,17 @@
** limitations under the License.
*/
-->
-<resources>
+<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<color name="chooser_row_divider">@*android:color/list_divider_color_light</color>
<color name="chooser_gradient_background">@*android:color/loading_gradient_background_color_light</color>
+
+ <color name="chooser_grid_layout_background">@androidprv:color/materialColorSurfaceContainer</color>
+ <color name="chooser_grid_preview_background">@androidprv:color/materialColorSurfaceContainer</color>
+ <color name="chooser_grid_item_text1_color">@androidprv:color/materialColorOnSurface</color>
+ <color name="chooser_grid_item_text2_color">@androidprv:color/materialColorOnSurfaceVariant</color>
+ <color name="content_preview_filename_text_color">@androidprv:color/materialColorOnSurface</color>
+ <color name="content_preview_more_files_text_color">@androidprv:color/materialColorOnSurfaceVariant</color>
+ <color name="content_preview_text_color">@androidprv:color/materialColorOnSurfaceVariant</color>
+ <color name="content_preview_copy_icon_tint">@androidprv:color/materialColorOnSurfaceVariant</color>
+ <color name="chooser_row_text_color">@androidprv:color/materialColorOnSurfaceVariant</color>
</resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 515343b6..805f00f5 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -43,6 +43,12 @@
<dimen name="chooser_grid_activity_name_text_size">12sp</dimen>
<dimen name="chooser_item_focus_outline_corner_radius">11dp</dimen>
<dimen name="chooser_item_focus_outline_width">2dp</dimen>
+ <dimen name="chooser_row_height">100dp</dimen>
+ <dimen name="content_preview_text_size">12sp</dimen>
+ <dimen name="content_preview_filename_line_size">16sp</dimen>
+ <dimen name="content_preview_more_files_text_size">12sp</dimen>
+ <dimen name="content_preview_more_files_line_size">16sp</dimen>
+ <dimen name="content_preview_copy_icon_size">48dp</dimen>
<dimen name="resolver_icon_size">32dp</dimen>
<dimen name="resolver_button_bar_spacing">0dp</dimen>
<dimen name="resolver_badge_size">18dp</dimen>
@@ -65,11 +71,29 @@
<dimen name="modify_share_text_toggle_max_width">150dp</dimen>
<dimen name="chooser_view_spacing">16dp</dimen>
+ <dimen name="preview_text_padding">124dp</dimen>
+ <dimen name="chooser_list_padding">0dp</dimen>
+ <dimen name="chooser_row_direct_share_height">200dp</dimen>
+ <dimen name="preview_text_min_height">46dp</dimen>
+ <dimen name="view_holder_height">200dp</dimen>
+ <dimen name="chooser_grid_item_space_height">7dp</dimen>
+
+ <dimen name="chooser_margin_vertical">80dp</dimen>
+ <dimen name="chooser_padding_bottom">80dp</dimen>
+ <dimen name="chooser_padding_start">0dp</dimen>
+ <dimen name="chooser_padding_end">0dp</dimen>
+ <dimen name="chooser_close_icon_size">60dp</dimen>
+ <dimen name="chooser_close_icon_size_margin">16dp</dimen>
+ <dimen name="chooser_content_view_margin_horizontal">200dp</dimen>
+ <dimen name="chooser_content_view_margin_vertical">16dp</dimen>
+ <dimen name="chooser_content_view_min_height">0dp</dimen>
+
<!-- Note that the values in this section are for landscape phones. For screen configs taller
than 480dp, the values are set in values-h480dp/dimens.xml -->
<dimen name="chooser_preview_width">412dp</dimen>
<dimen name="chooser_preview_image_height_tall">124dp</dimen>
- <dimen name="grid_padding">8dp</dimen>
+ <dimen name="grid_padding_vertical">8dp</dimen>
+ <dimen name="grid_padding_horizontal">4dp</dimen>
<dimen name="width_text_image_preview_size">46dp</dimen>
<!-- END SECTION -->
</resources>
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-18 15:30:57 +0000