Tune setup wizard layout for landscape and tablet

Bug: 8159728
Change-Id: Ic2206d50562d62578f8e5e50bbd3c36625dbafb7
main
Tadashi G. Takaoka 2013-04-23 18:19:38 +09:00
parent 0e96003e0f
commit 5cd7211ce6
10 changed files with 282 additions and 42 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -15,10 +15,12 @@
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <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_title_text_size">46sp</dimen>
<dimen name="setup_welcome_description_text_size">26sp</dimen> <dimen name="setup_welcome_description_text_size">26sp</dimen>
<dimen name="setup_step_bullet_text_size">22sp</dimen> <dimen name="setup_step_bullet_text_size">22sp</dimen>
<dimen name="setup_step_triangle_indicator_height">24dp</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_title_text_size">22sp</dimen>
<dimen name="setup_step_instruction_text_size">14sp</dimen> <dimen name="setup_step_instruction_text_size">14sp</dimen>
<dimen name="setup_step_action_text_size">18sp</dimen> <dimen name="setup_step_action_text_size">18sp</dimen>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>