Add common style attributes for new landscape design
FR: b/173664236 (approved for LTS6)
See https://markup.googleplex.com/projects/5135/v/latest/ for spec
Bug: 173072383
Test: New resources only
Change-Id: I8e90f8fe7edcb2dca893f0de12c4c7f17e956836
diff --git a/library/main/res/values-w1280dp-land/dimens.xml b/library/main/res/values-w1280dp-land/dimens.xml
new file mode 100644
index 0000000..1ed491e
--- /dev/null
+++ b/library/main/res/values-w1280dp-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">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
diff --git a/library/main/res/values-w1280dp/dimens.xml b/library/main/res/values-w1280dp/dimens.xml
new file mode 100644
index 0000000..1a3d98e
--- /dev/null
+++ b/library/main/res/values-w1280dp/dimens.xml
@@ -0,0 +1,20 @@
+<?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">148dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values-w1920dp-land/dimens.xml b/library/main/res/values-w1920dp-land/dimens.xml
new file mode 100644
index 0000000..6e5add0
--- /dev/null
+++ b/library/main/res/values-w1920dp-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">132dp</dimen>
+ <!-- The column inner padding of a two-column layout -->
+ <dimen name="suw_column_inner_padding_horizontal">80dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml
index 6767e03..a3df84d 100644
--- a/library/main/res/values/colors.xml
+++ b/library/main/res/values/colors.xml
@@ -23,4 +23,17 @@
<color name="blue_400">#6BA5ED</color>
<color name="car_suw_tint">@color/blue_400</color>
+
+ <!-- White -->
+ <color name="suw_color_primary">@android:color/white</color>
+ <!-- Material grey500 -->
+ <color name="suw_color_secondary">#9AA0A6</color>
+ <!-- Material blue300 -->
+ <color name="suw_color_accent">#8AB4F8</color>
+ <!-- Material grey200 -->
+ <color name="suw_color_list_icon">#E8EAED</color>
+ <!-- Material grey800 -->
+ <color name="suw_color_divider">#3C4043</color>
+ <!-- Material grey900 -->
+ <color name="suw_color_background">#202124</color>
</resources>
diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml
new file mode 100644
index 0000000..db6c833
--- /dev/null
+++ b/library/main/res/values/dimens.xml
@@ -0,0 +1,30 @@
+<?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_padding_3">16dp</dimen>
+ <dimen name="suw_padding_4">24dp</dimen>
+ <dimen name="suw_padding_5">32dp</dimen>
+ <dimen name="suw_padding_6">48dp</dimen>
+ <dimen name="suw_padding_7">64dp</dimen>
+ <dimen name="suw_padding_8">96dp</dimen>
+ <dimen name="suw_padding_9">128dp</dimen>
+
+ <dimen name="suw_page_margin_horizontal">112dp</dimen>
+ <!-- The column inner padding of a two-column layout. N/A in portrait -->
+ <dimen name="suw_column_inner_padding_horizontal">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/library/main/res/values/integers.xml b/library/main/res/values/integers.xml
new file mode 100644
index 0000000..f7c13cd
--- /dev/null
+++ b/library/main/res/values/integers.xml
@@ -0,0 +1,26 @@
+<?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>
+ <!-- The layout_weight of two-column layout -->
+ <integer name="suw_title_column_weight">5</integer>
+ <integer name="suw_content_column_weight">7</integer>
+
+ <!-- The layout_weight of single-column layout -->
+ <integer name="suw_page_content_weight">3</integer>
+ <integer name="suw_page_filler_weight">1</integer>
+</resources>
\ No newline at end of file
diff --git a/library/main/src/com/android/car/setupwizardlib/util/CarSetupWizardUiUtils.java b/library/main/src/com/android/car/setupwizardlib/util/CarSetupWizardUiUtils.java
index 3611931..4e1d8ca 100644
--- a/library/main/src/com/android/car/setupwizardlib/util/CarSetupWizardUiUtils.java
+++ b/library/main/src/com/android/car/setupwizardlib/util/CarSetupWizardUiUtils.java
@@ -31,9 +31,13 @@
public final class CarSetupWizardUiUtils {
private static final String TAG = CarSetupWizardUiUtils.class.getSimpleName();
- /** Key for immersive mode value pased to 1P apps */
+ /** Key for immersive mode value passed to 1P apps */
public static final String IMMERSIVE_MODE_TYPE = "immersiveModeType";
+ /** Key indicating whether 1P apps should switch to the new landscape design */
+ public static final String EXTRA_NEW_LANDSCAPE_LAYOUT_SUPPORTED =
+ "extra_new_landscape_layout_supported";
+
/** Hide system UI */
public static void hideSystemUI(Activity activity) {
maybeHideSystemUI(activity);
