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

Commit 46d89fd5 authored by Michael Kwan's avatar Michael Kwan Committed by Android (Google) Code Review
Browse files

Merge "Update text appearances for watch type device to conform with... 

Merge "Update text appearances for watch type device to conform with typography specs." into cw-f-dev
parents d35f69d6 7a446bb3

core/res/res/values-w180dp-notround-watch/dimens_material.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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="text_size_display_4_material">80sp</dimen>

    <dimen name="text_size_display_3_material">50sp</dimen>

    <dimen name="text_size_display_2_material">40sp</dimen>

    <dimen name="text_size_display_1_material">30sp</dimen>

    <dimen name="text_size_headline_material">20sp</dimen>

    <dimen name="text_size_title_material">18sp</dimen>

    <dimen name="text_size_subhead_material">18sp</dimen>

    <dimen name="text_size_title_material_toolbar">18dp</dimen>

    <dimen name="text_size_subtitle_material_toolbar">18dp</dimen>

    <dimen name="text_size_menu_material">18sp</dimen>

    <dimen name="text_size_menu_header_material">16sp</dimen>

    <dimen name="text_size_body_2_material">16sp</dimen>

    <dimen name="text_size_body_1_material">16sp</dimen>

    <dimen name="text_size_caption_material">14sp</dimen>

    <dimen name="text_size_button_material">16sp</dimen>



    <dimen name="text_size_large_material">18sp</dimen>

    <dimen name="text_size_medium_material">16sp</dimen>

    <dimen name="text_size_small_material">14sp</dimen>

</resources>

core/res/res/values-w210dp-round-watch/dimens_material.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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="text_size_display_4_material">80sp</dimen>

    <dimen name="text_size_display_3_material">50sp</dimen>

    <dimen name="text_size_display_2_material">40sp</dimen>

    <dimen name="text_size_display_1_material">30sp</dimen>

    <dimen name="text_size_headline_material">20sp</dimen>

    <dimen name="text_size_title_material">18sp</dimen>

    <dimen name="text_size_subhead_material">18sp</dimen>

    <dimen name="text_size_title_material_toolbar">18dp</dimen>

    <dimen name="text_size_subtitle_material_toolbar">18dp</dimen>

    <dimen name="text_size_menu_material">18sp</dimen>

    <dimen name="text_size_menu_header_material">16sp</dimen>

    <dimen name="text_size_body_2_material">16sp</dimen>

    <dimen name="text_size_body_1_material">16sp</dimen>

    <dimen name="text_size_caption_material">14sp</dimen>

    <dimen name="text_size_button_material">16sp</dimen>



    <dimen name="text_size_large_material">18sp</dimen>

    <dimen name="text_size_medium_material">16sp</dimen>

    <dimen name="text_size_small_material">14sp</dimen>

</resources>

core/res/res/values-watch/dimens_material.xml

+20 −0
Original line number Diff line number Diff line
@@ -14,5 +14,25 @@ 
     limitations under the License.

-->

<resources>

    <dimen name="text_size_display_4_material">71sp</dimen>

    <dimen name="text_size_display_3_material">44sp</dimen>

    <dimen name="text_size_display_2_material">36sp</dimen>

    <dimen name="text_size_display_1_material">27sp</dimen>

    <dimen name="text_size_headline_material">18sp</dimen>

    <dimen name="text_size_title_material">16sp</dimen>

    <dimen name="text_size_subhead_material">16sp</dimen>

    <dimen name="text_size_title_material_toolbar">16dp</dimen>

    <dimen name="text_size_subtitle_material_toolbar">16dp</dimen>

    <dimen name="text_size_menu_material">16sp</dimen>

    <dimen name="text_size_menu_header_material">14sp</dimen>

    <dimen name="text_size_body_2_material">14sp</dimen>

    <dimen name="text_size_body_1_material">14sp</dimen>

    <dimen name="text_size_caption_material">12sp</dimen>

    <dimen name="text_size_button_material">14sp</dimen>



    <dimen name="text_size_large_material">16sp</dimen>

    <dimen name="text_size_medium_material">14sp</dimen>

    <dimen name="text_size_small_material">12sp</dimen>



    <item name="text_line_spacing_multiplier_material" format="float" type="dimen">1.2</item>

</resources>

core/res/res/values-watch/styles_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ please see styles_device_defaults.xml. 
        <item name="divider">@empty</item>

    </style>



    <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Body1" />

    <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Caption" />



    <style name="Widget.Material.TextView" parent="Widget.TextView">

        <item name="breakStrategy">balanced</item>

    </style>

core/res/res/values/styles_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -475,6 +475,9 @@ please see styles_device_defaults.xml. 
        <item name="textColor">#66000000</item>

    </style>



    <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Subhead" />

    <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Body1" />



    <style name="Widget.Material.Notification.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" />



    <style name="Widget.Material.Notification.MessagingText" parent="Widget.Material.Light.TextView">