diff --git a/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad61c1a3ae5c4e141bd7ef2a024b2b04da598017
--- /dev/null
+++ b/java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for large-tablet/portrait. -->
+ <dimen name="setup_title_text_size">72sp</dimen>
+ <dimen name="setup_welcome_description_text_size">36sp</dimen>
+ <dimen name="setup_step_bullet_text_size">24sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
+ <dimen name="setup_step_indicator_height">24dp</dimen>
+ <dimen name="setup_step_title_text_size">24sp</dimen>
+ <dimen name="setup_step_instruction_text_size">18sp</dimen>
+ <dimen name="setup_step_action_text_size">20sp</dimen>
+ <dimen name="setup_vertical_padding">96dp</dimen>
+ <dimen name="setup_horizontal_padding">144dp</dimen>
+ <dimen name="setup_step_action_height">48dp</dimen>
+ <dimen name="setup_step_horizontal_padding">24dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
+ <dimen name="setup_step_vertical_padding">16dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">50</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">25</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">25</integer>
+</resources>
diff --git a/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69a8a7ad514cebc863cdb1c73cecd60b54872e06
--- /dev/null
+++ b/java/res/values-h330dp-land/setup-dimens-large-phone-land.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for large-phone/landscape. -->
+ <dimen name="setup_title_text_size">42sp</dimen>
+ <dimen name="setup_welcome_description_text_size">24sp</dimen>
+ <dimen name="setup_step_bullet_text_size">22sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
+ <dimen name="setup_step_indicator_height">24dp</dimen>
+ <dimen name="setup_step_title_text_size">22sp</dimen>
+ <dimen name="setup_step_instruction_text_size">14sp</dimen>
+ <dimen name="setup_step_action_text_size">18sp</dimen>
+ <dimen name="setup_vertical_padding">16dp</dimen>
+ <dimen name="setup_horizontal_padding">16dp</dimen>
+ <dimen name="setup_step_action_height">48dp</dimen>
+ <dimen name="setup_step_horizontal_padding">24dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
+ <dimen name="setup_step_vertical_padding">16dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">80</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>
+</resources>
diff --git a/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a14d591818730c360efbc21b938451db7a81d90
--- /dev/null
+++ b/java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for small-tablet/landscape. -->
+ <dimen name="setup_title_text_size">56sp</dimen>
+ <dimen name="setup_welcome_description_text_size">28sp</dimen>
+ <dimen name="setup_step_bullet_text_size">24sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
+ <dimen name="setup_step_indicator_height">24dp</dimen>
+ <dimen name="setup_step_title_text_size">24sp</dimen>
+ <dimen name="setup_step_instruction_text_size">18sp</dimen>
+ <dimen name="setup_step_action_text_size">20sp</dimen>
+ <dimen name="setup_vertical_padding">32dp</dimen>
+ <dimen name="setup_horizontal_padding">96dp</dimen>
+ <dimen name="setup_step_action_height">48dp</dimen>
+ <dimen name="setup_step_horizontal_padding">24dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
+ <dimen name="setup_step_vertical_padding">16dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">60</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">20</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">20</integer>
+</resources>
diff --git a/java/res/values/setup-dimens.xml b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
similarity index 94%
rename from java/res/values/setup-dimens.xml
rename to java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
index 5abc28982d8f1e89d8e7c7f17b9d21edc3093c41..b8dd33df46ebcd220bd8f81b121adf9b10947cb4 100644
--- a/java/res/values/setup-dimens.xml
+++ b/java/res/values-h540dp-port/setup-dimens-large-phone-port.xml
@@ -15,10 +15,12 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Setup wizard dimensions for large-phone/portrait. -->
<dimen name="setup_title_text_size">46sp</dimen>
<dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</dimen>
+ <dimen name="setup_step_indicator_height">24dp</dimen>
<dimen name="setup_step_title_text_size">22sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen>
diff --git a/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0004a3c857029aafe1f1ada648a59c79c9422b6b
--- /dev/null
+++ b/java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for large-tablet/landscape. -->
+ <dimen name="setup_title_text_size">58sp</dimen>
+ <dimen name="setup_welcome_description_text_size">28sp</dimen>
+ <dimen name="setup_step_bullet_text_size">24sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
+ <dimen name="setup_step_indicator_height">24dp</dimen>
+ <dimen name="setup_step_title_text_size">24sp</dimen>
+ <dimen name="setup_step_instruction_text_size">18sp</dimen>
+ <dimen name="setup_step_action_text_size">20sp</dimen>
+ <dimen name="setup_vertical_padding">96dp</dimen>
+ <dimen name="setup_horizontal_padding">192dp</dimen>
+ <dimen name="setup_step_action_height">48dp</dimen>
+ <dimen name="setup_step_horizontal_padding">24dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
+ <dimen name="setup_step_vertical_padding">16dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">50</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">25</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">25</integer>
+</resources>
diff --git a/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
new file mode 100644
index 0000000000000000000000000000000000000000..87c991c4d0ca7b1ee6bde6fa1e02ee5a952cf4ed
--- /dev/null
+++ b/java/res/values-h800dp-port/setup-dimens-small-tablet-port.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for small-tablet/portrait. -->
+ <dimen name="setup_title_text_size">72sp</dimen>
+ <dimen name="setup_welcome_description_text_size">36sp</dimen>
+ <dimen name="setup_step_bullet_text_size">24sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">24dp</dimen>
+ <dimen name="setup_step_indicator_height">24dp</dimen>
+ <dimen name="setup_step_title_text_size">24sp</dimen>
+ <dimen name="setup_step_instruction_text_size">18sp</dimen>
+ <dimen name="setup_step_action_text_size">20sp</dimen>
+ <dimen name="setup_vertical_padding">32dp</dimen>
+ <dimen name="setup_horizontal_padding">64dp</dimen>
+ <dimen name="setup_step_action_height">48dp</dimen>
+ <dimen name="setup_step_horizontal_padding">24dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">12dp</dimen>
+ <dimen name="setup_step_vertical_padding">16dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">60</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">20</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">20</integer>
+</resources>
diff --git a/java/res/values-land/setup-dimens-small-phone-land.xml b/java/res/values-land/setup-dimens-small-phone-land.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63f4661d1673a043ccb8644d16dcb564bda24614
--- /dev/null
+++ b/java/res/values-land/setup-dimens-small-phone-land.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for small-phone/landscape. -->
+ <dimen name="setup_title_text_size">36sp</dimen>
+ <dimen name="setup_welcome_description_text_size">18sp</dimen>
+ <dimen name="setup_step_bullet_text_size">18sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">18dp</dimen>
+ <dimen name="setup_step_indicator_height">18dp</dimen>
+ <dimen name="setup_step_title_text_size">18sp</dimen>
+ <dimen name="setup_step_instruction_text_size">14sp</dimen>
+ <dimen name="setup_step_action_text_size">16sp</dimen>
+ <dimen name="setup_vertical_padding">12dp</dimen>
+ <dimen name="setup_horizontal_padding">12dp</dimen>
+ <dimen name="setup_step_action_height">42dp</dimen>
+ <dimen name="setup_step_horizontal_padding">20dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">10dp</dimen>
+ <dimen name="setup_step_vertical_padding">12dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">24dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">80</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>
+</resources>
diff --git a/java/res/values-port/setup-dimens-small-phone-port.xml b/java/res/values-port/setup-dimens-small-phone-port.xml
new file mode 100644
index 0000000000000000000000000000000000000000..34f4d92406f0f4fbe20a73f49df36c51e007561a
--- /dev/null
+++ b/java/res/values-port/setup-dimens-small-phone-port.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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">
+ <!-- Setup wizard dimensions for small-phone/portrait. -->
+ <dimen name="setup_title_text_size">40sp</dimen>
+ <dimen name="setup_welcome_description_text_size">20sp</dimen>
+ <dimen name="setup_step_bullet_text_size">18sp</dimen>
+ <dimen name="setup_step_triangle_indicator_height">18dp</dimen>
+ <dimen name="setup_step_indicator_height">18dp</dimen>
+ <dimen name="setup_step_title_text_size">18sp</dimen>
+ <dimen name="setup_step_instruction_text_size">14sp</dimen>
+ <dimen name="setup_step_action_text_size">16sp</dimen>
+ <dimen name="setup_vertical_padding">12dp</dimen>
+ <dimen name="setup_horizontal_padding">12dp</dimen>
+ <dimen name="setup_step_action_height">42dp</dimen>
+ <dimen name="setup_step_horizontal_padding">20dp</dimen>
+ <dimen name="setup_step_horizontal_padding_half">10dp</dimen>
+ <dimen name="setup_step_vertical_padding">12dp</dimen>
+ <dimen name="setup_step_horizontal_line_height">2dp</dimen>
+ <integer name="setup_title_weight_in_screen">40</integer>
+ <integer name="setup_body_weight_in_screen">60</integer>
+ <dimen name="setup_welcome_video_vertical_margin">16dp</dimen>
+ <integer name="setup_welcome_video_weight_in_screen">80</integer>
+ <integer name="setup_welcome_video_left_padding_weight_in_screen">10</integer>
+ <integer name="setup_welcome_video_right_padding_weight_in_screen">10</integer>
+</resources>
diff --git a/java/res/values-sw600dp-land/setup-dimens.xml b/java/res/values-sw600dp-land/setup-dimens.xml
deleted file mode 100644
index e5051eac7dabfc39306b4dbfede94ea79b91b06e..0000000000000000000000000000000000000000
--- a/java/res/values-sw600dp-land/setup-dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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">
- <dimen name="setup_title_text_size">64sp</dimen>
- <dimen name="setup_welcome_description_text_size">36sp</dimen>
- <dimen name="setup_horizontal_padding">96dp</dimen>
-</resources>
diff --git a/java/res/values-sw768dp-land/setup-dimens.xml b/java/res/values-sw768dp-land/setup-dimens.xml
deleted file mode 100644
index 34b7f429d2150e8de55bb56d00d41b43cbc5349d..0000000000000000000000000000000000000000
--- a/java/res/values-sw768dp-land/setup-dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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">
- <dimen name="setup_title_text_size">64sp</dimen>
- <dimen name="setup_welcome_description_text_size">36sp</dimen>
- <dimen name="setup_horizontal_padding">192dp</dimen>
-</resources>