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

Commit 335ac123 authored by Clark Scheff's avatar Clark Scheff Committed by Gerrit Code Review
Browse files

Merge "Allow changing theme to Holo.Light without crashing" into cm-11.0

parents 1bc6a554 8cc23d58

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 
    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

            android:taskAffinity=""

            android:theme="@style/Theme.Settings"

            android:theme="@style/Theme.Settings.Holo"

            android:hardwareAccelerated="true"

            android:requiredForAllUsers="true"

            android:supportsRtl="true">

res/values/themes.xml

+5 −2
Original line number Diff line number Diff line
@@ -60,12 +60,15 @@ 
    </style>



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

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>

        <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>

    </style>



    <style name="Theme.Settings.Holo" parent="@style/Theme.Settings">

        <item name="apnPreferenceStyle">@style/ApnPreference</item>

        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>

        <item name="ic_wps">@drawable/ic_wps_dark</item>

        <item name="wifi_signal">@drawable/wifi_signal_dark</item>

        <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>

    </style>



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