Simplify resource definition for landscape phones.

Previously had to define several values twice. Not use values/ for the
landscape phone values and values-h480dp/ for values for any device
config taller than 480dp (basically not a landscape phone).

Bug: 267522604
Test: Verifying no visual behavior change in either rotation on tablets
     and phones.
Test: atest IntentResolverUnitTests
Change-Id: I8afdb13b7d4a7949ddbaf0f6eabc37d2b3e38a46

10 files changed, 19 insertions, 78 deletions

diff --git a/java/res/values-land/bools.xml b/java/res/values-h480dp/bools.xml
index 761de1ea..761de1ea 100644
--- a/java/res/values-land/bools.xml
+++ b/java/res/values-h480dp/bools.xml
diff --git a/java/res/values-h480dp/dimens.xml b/java/res/values-h480dp/dimens.xml
index 9cdc8899..41a5a980 100644
--- a/java/res/values-h480dp/dimens.xml
+++ b/java/res/values-h480dp/dimens.xml
@@ -20,4 +20,8 @@
     <dimen name="resolver_empty_state_container_padding_bottom">48dp</dimen>
     <dimen name="resolver_title_padding_bottom">@dimen/resolver_edge_margin</dimen>
     <dimen name="resolver_button_bar_spacing">8dp</dimen>
-</resources>
\ No newline at end of file
+
+    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
+    <dimen name="chooser_preview_width">-1px</dimen>
+    <dimen name="chooser_view_spacing">18dp</dimen>
+</resources>
diff --git a/java/res/values-sw600dp/integers.xml b/java/res/values-h480dp/integers.xml
index c1693057..c1693057 100644
--- a/java/res/values-sw600dp/integers.xml
+++ b/java/res/values-h480dp/integers.xml
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
deleted file mode 100644
index e3169efd..00000000
--- a/java/res/values-land/dimens.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
-<resources>
-    <dimen name="chooser_preview_width">412dp</dimen>
-    <dimen name="chooser_preview_image_height_tall">64dp</dimen>
-    <dimen name="chooser_view_spacing">8dp</dimen>
-    <integer name="text_preview_lines">1</integer>
-    <bool name="horizontal_actions">true</bool>
-</resources>
diff --git a/java/res/values-land/integers.xml b/java/res/values-land/integers.xml
deleted file mode 100644
index 2e310d87..00000000
--- a/java/res/values-land/integers.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <integer name="text_preview_lines">1</integer>
-</resources>
diff --git a/java/res/values-sw600dp/bools.xml b/java/res/values-sw600dp/bools.xml
deleted file mode 100644
index 761de1ea..00000000
--- a/java/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,20 +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.
-  -->
-
-<resources>
-    <bool name="horizontal_actions">false</bool>
-</resources>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 6cd29747..fc8ac066 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -18,10 +18,5 @@
 */
 -->
 <resources>
-
     <dimen name="chooser_width">624dp</dimen>
-    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
-    <dimen name="chooser_view_spacing">18dp</dimen>
-    <integer name="text_preview_lines">3</integer>
-    <bool name="horizontal_actions">false</bool>
 </resources>
diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml
index 641620d7..fb7c747b 100644
--- a/java/res/values/bools.xml
+++ b/java/res/values/bools.xml
@@ -15,5 +15,7 @@
 -->
 
 <resources>
-  <bool name="horizontal_actions">false</bool>
+  <!-- Note that this is the value for landscape phones, the value for all screens taller than
+       480dp is set in values-h480dp/bools.xml -->
+  <bool name="horizontal_actions">true</bool>
 </resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 947351d8..cd1ae1ca 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -21,16 +21,13 @@
     <dimen name="chooser_corner_radius">28dp</dimen>
     <dimen name="chooser_corner_radius_small">14dp</dimen>
     <dimen name="chooser_row_text_option_translate">25dp</dimen>
-    <dimen name="chooser_view_spacing">18dp</dimen>
     <dimen name="chooser_edge_margin_thin">8dp</dimen>
     <dimen name="chooser_edge_margin_normal">24dp</dimen>
     <dimen name="chooser_edge_margin_normal_half">12dp</dimen>
     <dimen name="chooser_preview_image_font_size">20sp</dimen>
     <dimen name="chooser_preview_image_border">1dp</dimen>
     <dimen name="chooser_preview_image_width">120dp</dimen>
-    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
     <dimen name="chooser_preview_image_max_dimen">200dp</dimen>
-    <dimen name="chooser_preview_width">-1px</dimen>
     <dimen name="chooser_header_scroll_elevation">4dp</dimen>
     <dimen name="chooser_max_collapsed_height">288dp</dimen>
     <dimen name="chooser_direct_share_label_placeholder_max_width">72dp</dimen>
@@ -55,4 +52,11 @@
 
     <dimen name="chooser_action_view_icon_size">22dp</dimen>
     <dimen name="chooser_action_margin">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">64dp</dimen>
+    <dimen name="chooser_view_spacing">8dp</dimen>
+    <!-- END SECTION -->
 </resources>
diff --git a/java/res/values/integers.xml b/java/res/values/integers.xml
index c1693057..6d57e43e 100644
--- a/java/res/values/integers.xml
+++ b/java/res/values/integers.xml
@@ -14,6 +14,8 @@
   ~ limitations under the License.
   -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <integer name="text_preview_lines">3</integer>
+<resources>
+    <!-- Note that this is the value for landscape phones, the value for all screens taller than
+         480dp is set in values-h480dp/integers.xml -->
+    <integer name="text_preview_lines">1</integer>
 </resources>