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

Commit 2e85c126 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am b325345e: Merge "Switch framework Holo references to Quantum.Light" 

* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
parents 23dac428 794c5acb

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
        <activity

            android:name=".SettingsActivity"

            android:label="@string/menu_settings"

            android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"

            android:theme="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge"

            android:exported="false" />



        <provider

res/values-sw720dp/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
-->



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

    <style name="Theme" parent="@android:style/Theme.Holo.Light">

    <style name="Theme" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:actionOverflowButtonStyle">@style/DarkerOverflow</item>

        <item name="android:windowBackground">@*android:drawable/dialog_full_holo_light</item>

        <item name="android:colorBackgroundCacheHint">@null</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowAnimationStyle">@*android:style/Animation.Holo.Dialog</item>

        <item name="android:windowAnimationStyle">@*android:style/Animation.DeviceDefault.Dialog</item>

    </style>

</resources>

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 


    <!-- Normally just a redirection, but this is used to make ourselves a

         dialog on large tablets -->

    <style name="Theme" parent="@android:style/Theme.Holo.Light">

    <style name="Theme" parent="@android:style/Theme.DeviceDefault.Light">

        <item name="android:actionOverflowButtonStyle">@style/DarkerOverflow</item>

    </style>

    

    <style name="DarkerOverflow" parent="@android:style/Widget.Holo.Light.ActionButton.Overflow">

    <style name="DarkerOverflow" parent="@android:style/Widget.DeviceDefault.Light.ActionButton.Overflow">

        <item name="android:src">@drawable/ic_menu_overflow</item>

    </style>