Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a16c556: am e2f9f71c: Merge "Add a theme for setup and/or form style input for TV/leanback" into lmp-dev

Browse Source 
* commit '6a16c556a5a33ebc70c655264f4352ae4375b1cb':
  Add a theme for setup and/or form style input for TV/leanback
This commit is contained in:
Justin Mattson
2014-07-15 22:22:13 +00:00
committed by Android Git Automerger
parent 7dfac32865 28da19d7cf
commit 5bcbc3dfd4
4 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/res/res/drawable/background_leanback_setup.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@color/black"/>
</layer-list>

4
core/res/res/values/public.xml
View File

@@ -2495,6 +2495,10 @@
<public-padding type="interpolator" name="l_resource_pad" end="0x010c0010" />
<!-- @SystemApi -->
<!-- @hide -->
<public type="style" name="Theme.Leanback.FormWizard"/>
<!-- An interpolator which accelerates fast but decelerates slowly. -->
<public type="interpolator" name="fast_out_slow_in" />
<!-- An interpolator which starts with a peak non-zero velocity and decelerates slowly. -->

26
core/res/res/values/styles_leanback.xml
View File

@@ -30,4 +30,30 @@
<item name="hideWheelUntilFocused">true</item>
</style>
<!-- Setup and form wizard themes -->
<style name="TextAppearance.Leanback.FormWizard" parent="@style/TextAppearance.Material">
<item name="textSize">18sp</item>
<item name="fontFamily">sans-serif-light</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>
</style>
<style name="TextAppearance.Leanback.FormWizard.Medium" parent="@style/TextAppearance.Material.Medium">
<item name="textSize">36sp</item>
<item name="fontFamily">sans-serif-thin</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>
</style>
<style name="TextAppearance.Leanback.FormWizard.ListItem" parent="@style/TextAppearance.Material.Subhead">
<item name="textSize">18sp</item>
<item name="fontFamily">sans-serif-condensed</item>
</style>
</resources>

13
core/res/res/values/themes_leanback.xml
View File

@@ -62,4 +62,17 @@
<item name="windowCloseOnTouchOutside">false</item>
<item name="alertDialogStyle">@style/AlertDialog.Leanback</item>
</style>
<!-- Setup and form wizard themes -->
<style name="Theme.Leanback.FormWizard" parent="Theme.Material.NoActionBar">
<item name="windowBackground">@drawable/background_leanback_setup</item>
<item name="colorBackgroundCacheHint">@null</item>
<item name="windowShowWallpaper">false</item>
<item name="textAppearanceSmall">@style/TextAppearance.Leanback.FormWizard.Small</item>
<item name="textAppearanceMedium">@style/TextAppearance.Leanback.FormWizard.Medium</item>
<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>
</style>
</resources>