summaryrefslogtreecommitdiff
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/chooser_grid_preview_file.xml10
-rw-r--r--java/res/layout/chooser_grid_preview_image.xml16
-rw-r--r--java/res/layout/chooser_grid_preview_text.xml10
-rw-r--r--java/res/layout/chooser_headline_row.xml57
-rw-r--r--java/res/values/strings.xml30
5 files changed, 31 insertions, 92 deletions
diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml
index 036c5318..6ba06b3d 100644
--- a/java/res/layout/chooser_grid_preview_file.xml
+++ b/java/res/layout/chooser_grid_preview_file.xml
@@ -27,8 +27,6 @@
android:paddingBottom="@dimen/chooser_view_spacing"
android:background="?android:attr/colorBackground">
- <include layout="@layout/chooser_headline_row" />
-
<LinearLayout
android:layout_width="@dimen/chooser_preview_width"
android:layout_height="wrap_content"
@@ -71,6 +69,14 @@
android:textAppearance="@style/TextAppearance.ChooserDefault" />
</LinearLayout>
+ <TextView
+ android:id="@+id/reselection_action"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="center"
+ style="@style/ReselectionAction" />
+
<ViewStub
android:id="@+id/action_row_stub"
android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml
index 9ad594e8..1c0e4c2e 100644
--- a/java/res/layout/chooser_grid_preview_image.xml
+++ b/java/res/layout/chooser_grid_preview_image.xml
@@ -24,7 +24,13 @@
android:orientation="vertical"
android:background="?android:attr/colorBackground">
- <include layout="@layout/chooser_headline_row" />
+ <CheckBox
+ android:id="@+id/include_text_action"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_marginEnd="@dimen/chooser_edge_margin_normal"
+ android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
@@ -53,6 +59,14 @@
android:textAppearance="@style/TextAppearance.ChooserDefault" />
</LinearLayout>
+ <TextView
+ android:id="@+id/reselection_action"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="center"
+ style="@style/ReselectionAction" />
+
<ViewStub
android:id="@+id/action_row_stub"
android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml
index 47beaa5a..f521e31d 100644
--- a/java/res/layout/chooser_grid_preview_text.xml
+++ b/java/res/layout/chooser_grid_preview_text.xml
@@ -26,8 +26,6 @@
android:orientation="vertical"
android:background="?android:attr/colorBackground">
- <include layout="@layout/chooser_headline_row" />
-
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -84,6 +82,14 @@
android:focusable="true"/>
</RelativeLayout>
+ <TextView
+ android:id="@+id/reselection_action"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ android:gravity="center"
+ style="@style/ReselectionAction" />
+
<ViewStub
android:id="@+id/action_row_stub"
android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_headline_row.xml b/java/res/layout/chooser_headline_row.xml
deleted file mode 100644
index 9dfab892..00000000
--- a/java/res/layout/chooser_headline_row.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2023 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"
- xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingHorizontal="@dimen/chooser_edge_margin_normal"
->
- <TextView
- android:id="@+id/headline"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:layout_alignParentStart="true"
- android:textColor="?android:attr/textColorPrimary"
- android:fontFamily="@androidprv:string/config_headlineFontFamily"
- android:textSize="18sp"
- android:paddingBottom="16dp"
- />
-
- <TextView
- android:id="@+id/reselection_action"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:visibility="gone"
- android:paddingBottom="16dp"
- style="@style/ReselectionAction" />
-
- <!-- This is only relevant for image+text preview, but needs to be in this layout so it can
- stay at the top if there's no reselection action. -->
- <CheckBox
- android:id="@+id/include_text_action"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_below="@id/reselection_action"
- android:layout_alignWithParentIfMissing="true"
- android:visibility="gone" />
-
-</RelativeLayout>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index f38666e4..d1c97c7e 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -137,36 +137,6 @@
}
</string>
- <!-- Title atop a sharing UI indicating that text is being shared [CHAR_LIMIT=25] -->
- <string name="sharing_text">Sharing text</string>
- <!-- Title atop a sharing UI indicating that a link (URL) is being shared [CHAR_LIMIT=25] -->
- <string name="sharing_link">Sharing link</string>
- <!-- Title atop a sharing UI indicating that some images are being shared [CHAR_LIMIT=25] -->
- <string name="sharing_images">{count, plural,
- =1 {Sharing image}
- other {Sharing # images}
- }
- </string>
- <!-- Title atop a sharing UI indicating that some videos are being shared [CHAR_LIMIT=25] -->
- <string name="sharing_videos">{count, plural,
- =1 {Sharing video}
- other {Sharing # videos}
- }
- </string>
- <!-- Title atop a sharing UI indicating that some number of items are being shared
- (for example: sharing a mixture of photos and videos [CHAR_LIMIT=25] -->
- <string name="sharing_items">{count, plural,
- =1 {Sharing # item}
- other {Sharing # items}
- }
- </string>
- <!-- Title atop a sharing UI indicating that an image is being shared with text attached.
- [CHAR_LIMIT=25] -->
- <string name="sharing_image_with_text">Sharing image with text</string>
- <!-- Title atop a sharing UI indicating that an image is being shared with a link (URL)
- attached. [CHAR_LIMIT=25] -->
- <string name="sharing_image_with_link">Sharing image with link</string>
-
<!-- ChooserActivity - No direct share targets are available. [CHAR LIMIT=NONE] -->
<string name="chooser_no_direct_share_targets">No recommended people to share with</string>
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2026-01-16 05:29:47 +0000