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

Commit 645b709d authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #14323392 Old Settings screen is shown while choosing Settings shortcut"

parents 7c67b677 181b9803

res/values/styles.xml

+0 −3
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ 
        <item name="android:windowContentOverlay">@null</item>

    </style>



    <style name="Theme.CreateShortCut" parent="android:Theme.Quantum.Light.DialogWhenLarge">

    </style>



    <style name="PreferenceHeaderPanelSinglePane">

        <item name="android:layout_marginStart">0dp</item>

        <item name="android:layout_marginEnd">0dp</item>

res/values/themes.xml

+12 −0
Original line number Diff line number Diff line
@@ -59,6 +59,18 @@ 
        <item name="wifi_signal">@drawable/wifi_signal_light</item>

    </style>



    <style name="Theme.CreateShortCut" parent="android:Theme.Quantum.Light.DialogWhenLarge">

        <item name="android:actionBarWidgetTheme">@android:style/ThemeOverlay.Quantum.ActionBarWidget</item>

        <item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark</item>



        <item name="android:colorPrimary">@color/actionbar_background_color</item>

        <!-- Used by the bouncing effect for ListView and ScrollView -->

        <item name="android:colorPrimaryLight">@color/actionbar_background_color</item>

        <!-- Used by the StatusBar and NavBar -->

        <item name="android:colorPrimaryDark">@color/actionbar_background_color</item>

        <item name="android:colorAccent">@color/quantum_orange_A200</item>

    </style>



    <style name="Theme.Settings" parent="@android:style/Theme.Quantum.Light.DarkActionBar">

        <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>

        <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>