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

Make Theme.Micro point to Theme.Material

Browse Source 
Bug: 18768870

Change-Id: I8dc8d1b539425da9ae7aaa71fa4de685dd1e75f0
This commit is contained in:
Vinod Krishnan
2015-03-12 11:10:29 -07:00
parent 5228d0832a
commit 569635c57d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/values/styles_micro.xml
View File

@@ -16,7 +16,7 @@
<resources>
<style name="Animation.Micro"/>
<style name="Animation.Micro.Activity" parent="Animation.Holo.Activity">
<style name="Animation.Micro.Activity" parent="Animation.Material.Activity">
<item name="activityOpenEnterAnimation">@anim/slide_in_micro</item>
<item name="activityOpenExitAnimation">@null</item>
<item name="activityCloseEnterAnimation">@null</item>
@@ -35,7 +35,7 @@
<item name="wallpaperIntraCloseExitAnimation">@null</item>
</style>
<style name="AlertDialog.Micro" parent="AlertDialog.Holo.Light">
<style name="AlertDialog.Micro" parent="AlertDialog.Material.Light">
<item name="fullDark">@null</item>
<item name="topDark">@null</item>
<item name="centerDark">@null</item>
@@ -55,19 +55,19 @@
<item name="textAppearance">@style/TextAppearance.Micro.DialogWindowTitle</item>
</style>
<style name="TextAppearance.Micro" parent="TextAppearance.Holo">
<style name="TextAppearance.Micro" parent="TextAppearance.Material">
<item name="textSize">20sp</item>
<item name="fontFamily">sans-serif-condensed-light</item>
<item name="textColor">@color/micro_text_light</item>
</style>
<style name="TextAppearance.Micro.DialogWindowTitle" parent="TextAppearance.Holo.DialogWindowTitle">
<style name="TextAppearance.Micro.DialogWindowTitle" parent="TextAppearance.Material.DialogWindowTitle">
<item name="textSize">20sp</item>
<item name="fontFamily">sans-serif-condensed-light</item>
<item name="textColor">@color/micro_text_light</item>
</style>
<style name="Widget.Micro" parent="Widget.Holo" />
<style name="Widget.Micro" parent="Widget.Material" />
<style name="Widget.Micro.TextView">
<item name="fontFamily">sans-serif-condensed</item>

6
core/res/res/values/themes_micro.xml
View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
<style name="Theme.Micro" parent="Theme.Holo.NoActionBar">
<style name="Theme.Micro" parent="Theme.Material.NoActionBar">
<item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item>
<item name="alertDialogStyle">@style/AlertDialog.Micro</item>
<item name="dialogTheme">@style/Theme.Micro.Dialog</item>
@@ -29,7 +29,7 @@
<item name="windowOverscan">true</item>
</style>
<style name="Theme.Micro.Light" parent="Theme.Holo.Light.NoActionBar">
<style name="Theme.Micro.Light" parent="Theme.Material.Light.NoActionBar">
<item name="alertDialogTheme">@style/Theme.Micro.Dialog.Alert</item>
<item name="alertDialogStyle">@style/AlertDialog.Micro</item>
<item name="dialogTheme">@style/Theme.Micro.Dialog</item>
@@ -44,7 +44,7 @@
<item name="windowOverscan">true</item>
</style>
<style name="Theme.Micro.Dialog" parent="Theme.Holo.Light.Dialog">
<style name="Theme.Micro.Dialog" parent="Theme.Material.Light.Dialog">
<item name="windowTitleStyle">@android:style/DialogWindowTitle.Micro</item>
<item name="windowIsFloating">false</item>
<item name="windowFullscreen">true</item>