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

Commit 8cc23d58 authored by Clark Scheff's avatar Clark Scheff
Browse files

Allow changing theme to Holo.Light without crashing 

Themes that attempt to change the settings theme's parent to
Holo.Light will end up crashing wifi settings.

Themers should override Theme.Settings.Base and leave Theme.Settings.Holo
alone.  Attempting to theme Theme.Settings.Holo will result in crashes
when accessing wifi settings.

This was patch was adapted from
https://github.com/tung91/android_packages_apps_Settings/commit/007f03b559c6d13115c63c4f601ebc4b9324d32d

Change-Id: I61951b892acac6304d2c3dd02668eb70af93eef9
parent 39bb846f

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">