openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Inherit TextAppearance.DeviceDefault for the RRO text font" into ub-launcher3-master

This commit is contained in:
Hyunyoung Song 2019-02-28 07:44:47 +00:00 committed by Android (Google) Code Review
parent 069988354a 72dae7f4ce
commit 9272d0d31b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/styles.xml
View File

@ -126,7 +126,7 @@
<style name="WidgetContainerTheme.Dark" />
<style name="FastScrollerPopup" >
<style name="FastScrollerPopup" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:layout_width">wrap_content</item>
<item name="android:minWidth">@dimen/fastscroll_popup_width</item>
<item name="android:layout_height">@dimen/fastscroll_popup_height</item>
@ -142,7 +142,7 @@
</style>
<!-- Base theme for BubbleTextView and sub classes -->
<style name="BaseIcon">
<style name="BaseIcon" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center</item>
@ -150,7 +150,6 @@
<item name="android:gravity">center_horizontal</item>
<item name="android:lines">1</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:fontFamily">sans-serif-condensed</item>
<item name="android:defaultFocusHighlightEnabled">false</item>
<!-- No shadows in the base theme -->
@ -158,7 +157,7 @@
</style>
<!-- Icon displayed on the worksapce -->
<style name="BaseIcon.Workspace">
<style name="BaseIcon.Workspace" >
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">?attr/workspaceShadowColor</item>
<item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
@ -190,9 +189,7 @@
<style name="DropTargetButton" parent="DropTargetButtonBase" />
<style name="TextTitle">
<item name="android:fontFamily">sans-serif</item>
</style>
<style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault" />
<style name="AllAppsEmptySearchBackground">
<item name="android:colorPrimary">#E0E0E0</item>