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

Commit d3a73b25 authored by Justin Mattson's avatar Justin Mattson Committed by Android (Google) Code Review
Browse files

Merge "Tweak leanback form style" into lmp-dev

parents d7df9d7b 90c84662

core/res/res/color/primary_text_leanback_formwizard_dark.xml

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

<!-- Copyright (C) 2014 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.

-->



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

    <item android:state_enabled="false"

        android:alpha="@dimen/disabled_alpha_leanback_formwizard"

        android:color="@color/primary_text_leanback_formwizard_default_dark"/>

    <item android:color="@color/primary_text_leanback_formwizard_default_dark"/>

</selector>

core/res/res/values/colors_leanback.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,4 +25,5 @@ 
    <color name="primary_text_leanback_light">#cc222222</color>

    <color name="secondary_text_leanback_light">#99222222</color>



    <color name="primary_text_leanback_formwizard_default_dark">#ffeeeeee</color>

</resources>

core/res/res/values/dimens_leanback.xml

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

<!-- Copyright (C) 2014 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>

    <!-- Default alpha value for disabled elements. -->

    <item name="disabled_alpha_leanback_formwizard" format="float" type="dimen">0.2</item>

</resources>

core/res/res/values/styles_leanback.xml

+5 −1
Original line number Diff line number Diff line
@@ -39,25 +39,29 @@ 
    <style name="TextAppearance.Leanback.FormWizard" parent="@style/TextAppearance.Material">

        <item name="textSize">18sp</item>

        <item name="fontFamily">sans-serif-light</item>

        <item name="textColor">?attr/textColorPrimary</item>

    </style>



    <style name="TextAppearance.Leanback.FormWizard.Small" parent="@style/TextAppearance.Material.Small">

        <item name="textSize">18sp</item>

        <item name="fontFamily">sans-serif-light</item>

        <item name="textColor">?attr/textColorPrimary</item>

    </style>



    <style name="TextAppearance.Leanback.FormWizard.Medium" parent="@style/TextAppearance.Material.Medium">

        <item name="textSize">36sp</item>

        <item name="fontFamily">sans-serif-thin</item>

        <item name="textColor">?attr/textColorPrimary</item>

    </style>



    <style name="TextAppearance.Leanback.FormWizard.Large" parent="@style/TextAppearance.Material.Large">

        <item name="textSize">56sp</item>

        <item name="fontFamily">sans-serif-thin</item>

        <item name="textColor">?attr/textColorPrimary</item>

    </style>



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

        <item name="textSize">18sp</item>

        <item name="textSize">16sp</item>

        <item name="fontFamily">sans-serif-condensed</item>

    </style>

core/res/res/values/themes_leanback.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,5 +57,6 @@ 
        <item name="textAppearanceLarge">@style/TextAppearance.Leanback.FormWizard.Large</item>

        <item name="textAppearanceListItem">@style/TextAppearance.Leanback.FormWizard.ListItem</item>

        <item name="textAppearance">@style/TextAppearance.Leanback.FormWizard</item>

        <item name="textColorPrimary">@color/primary_text_leanback_formwizard_dark</item>

    </style>

</resources>