From e79af30e90ff5b7399d7e3988ee50388050634cb Mon Sep 17 00:00:00 2001
From: Jian Jin <jinjian@google.com>
Date: Wed, 20 Jan 2021 16:19:09 -0800
Subject: Change landscape cutoff to 1240dp

Bug: 177560699
Test: CarSetupWizardLibRoboTests
Change-Id: I18eb19db546102e2c7be2e45813b388b2c515ffd
---
 library/main/res/values-w1240dp-land/config.xml | 20 ++++++++++++++++++++
 library/main/res/values-w1240dp-land/dimens.xml | 22 ++++++++++++++++++++++
 library/main/res/values-w1280dp-land/config.xml | 20 --------------------
 library/main/res/values-w1280dp-land/dimens.xml | 22 ----------------------
 4 files changed, 42 insertions(+), 42 deletions(-)
 create mode 100644 library/main/res/values-w1240dp-land/config.xml
 create mode 100644 library/main/res/values-w1240dp-land/dimens.xml
 delete mode 100644 library/main/res/values-w1280dp-land/config.xml
 delete mode 100644 library/main/res/values-w1280dp-land/dimens.xml

diff --git a/library/main/res/values-w1240dp-land/config.xml b/library/main/res/values-w1240dp-land/config.xml
new file mode 100644
index 0000000..98343f3
--- /dev/null
+++ b/library/main/res/values-w1240dp-land/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2018 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>
+    <!-- Indicates that this device is not in narrow mode so Activities can adjust accordingly -->
+    <bool name="is_layout_narrow">false</bool>
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values-w1240dp-land/dimens.xml b/library/main/res/values-w1240dp-land/dimens.xml
new file mode 100644
index 0000000..257d03a
--- /dev/null
+++ b/library/main/res/values-w1240dp-land/dimens.xml
@@ -0,0 +1,22 @@
+<?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
+  -->
+
+<resources>
+    <dimen name="suw_page_margin_horizontal">64dp</dimen>
+    <!-- The column inner padding of a two-column layout -->
+    <dimen name="suw_column_inner_padding_horizontal">48dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values-w1280dp-land/config.xml b/library/main/res/values-w1280dp-land/config.xml
deleted file mode 100644
index 98343f3..0000000
--- a/library/main/res/values-w1280dp-land/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2018 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>
-    <!-- Indicates that this device is not in narrow mode so Activities can adjust accordingly -->
-    <bool name="is_layout_narrow">false</bool>
-</resources>
\ No newline at end of file
diff --git a/library/main/res/values-w1280dp-land/dimens.xml b/library/main/res/values-w1280dp-land/dimens.xml
deleted file mode 100644
index 1ed491e..0000000
--- a/library/main/res/values-w1280dp-land/dimens.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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
-  -->
-
-<resources>
-    <dimen name="suw_page_margin_horizontal">80dp</dimen>
-    <!-- The column inner padding of a two-column layout -->
-    <dimen name="suw_column_inner_padding_horizontal">48dp</dimen>
-</resources>
\ No newline at end of file
-- 
cgit v1.2.3