diff options
| -rw-r--r-- | java/res/layout/chooser_action_row.xml | 40 | ||||
| -rw-r--r-- | java/res/layout/chooser_grid_preview_file.xml | 7 | ||||
| -rw-r--r-- | java/res/layout/chooser_grid_preview_image.xml | 8 | ||||
| -rw-r--r-- | java/res/layout/chooser_grid_preview_text.xml | 7 |
4 files changed, 43 insertions, 19 deletions
diff --git a/java/res/layout/chooser_action_row.xml b/java/res/layout/chooser_action_row.xml new file mode 100644 index 00000000..303426c4 --- /dev/null +++ b/java/res/layout/chooser_action_row.xml @@ -0,0 +1,40 @@ +<!-- + ~ 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. + --> + +<merge + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> + + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:background="?androidprv:attr/materialColorSurfaceContainer" + /> + + <com.android.intentresolver.widget.ScrollableActionRow + android:id="@androidprv:id/chooser_action_row" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:gravity="center"/> + + <View + android:layout_width="match_parent" + android:layout_height="2dp" + android:background="?androidprv:attr/materialColorSurfaceContainer" + /> +</merge> + diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml index bcc320d3..c9ef952a 100644 --- a/java/res/layout/chooser_grid_preview_file.xml +++ b/java/res/layout/chooser_grid_preview_file.xml @@ -71,12 +71,7 @@ android:textAppearance="@style/TextAppearance.ChooserDefault" /> </LinearLayout> - <com.android.intentresolver.widget.ScrollableActionRow - android:id="@androidprv:id/chooser_action_row" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:gravity="center" /> + <include layout="@layout/chooser_action_row" /> </LinearLayout> diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml index 2cfab2a8..7df0c815 100644 --- a/java/res/layout/chooser_grid_preview_image.xml +++ b/java/res/layout/chooser_grid_preview_image.xml @@ -62,11 +62,5 @@ android:textAppearance="@style/TextAppearance.ChooserDefault" /> </LinearLayout> - <com.android.intentresolver.widget.ScrollableActionRow - android:id="@androidprv:id/chooser_action_row" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:gravity="center" /> - + <include layout="@layout/chooser_action_row" /> </LinearLayout> diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml index 5e7afa46..89e961e8 100644 --- a/java/res/layout/chooser_grid_preview_text.xml +++ b/java/res/layout/chooser_grid_preview_text.xml @@ -84,12 +84,7 @@ android:focusable="true"/> </RelativeLayout> - <com.android.intentresolver.widget.ScrollableActionRow - android:id="@androidprv:id/chooser_action_row" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:gravity="center" /> + <include layout="@layout/chooser_action_row" /> </LinearLayout> |