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

Commit 7a2df74b authored by Vinod Krishnan's avatar Vinod Krishnan Committed by Android Git Automerger
Browse files

am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev 

* commit '3f782ad1':
  Make Theme.Micro point to Theme.Material
parents e7114123 3f782ad1

core/res/res/values/styles_micro.xml

+5 −5
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/themes_micro.xml

+3 −3
Original line number Diff line number Diff line
@@ -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>