Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38df0ed2 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am b40a8c06: Merge "Tune setup wizard layout for landscape and tablet" 

* commit 'b40a8c06':
  Tune setup wizard layout for landscape and tablet
parents 6448f749 b40a8c06

java/res/values-sw768dp-land/setup-dimens.xml→java/res/values-h1200dp-port/setup-dimens-large-tablet-port.xml

+40 −0
Original line number Diff line number Diff line
@@ -15,7 +15,26 @@ 
-->



<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <dimen name="setup_title_text_size">64sp</dimen>

    <!-- 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_horizontal_padding">192dp</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>

java/res/values-h330dp-land/setup-dimens-large-phone-land.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?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>

java/res/values-h520dp-land/setup-dimens-small-tablet-land.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?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>

java/res/values/setup-dimens.xml→java/res/values-h540dp-port/setup-dimens-large-phone-port.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

java/res/values-h720dp-land/setup-dimens-large-tablet-land.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?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>