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

Commit 679ddfcb authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2952-a15-theme' into 'a15' 

Port theme changes from A14

See merge request !72
parents b5e0eed0 4250f3d6

res/layout-v34/settingslib_main_switch_bar.xml

+2 −3
Original line number Diff line number Diff line
@@ -37,15 +37,14 @@ 
            android:lineBreakWordStyle="phrase"

            style="@style/MainSwitchText.Settingslib" />



        <com.google.android.material.materialswitch.MaterialSwitch

        <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:background="@null"

            android:clickable="false"

            android:focusable="false"

            android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

            android:focusable="false" />

    </LinearLayout>



</LinearLayout>

res/layout/long_screen_list_item.xml

+1 −2
Original line number Diff line number Diff line
@@ -45,6 +45,5 @@ 
        android:id="@+id/state"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@null"

        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />

        android:background="@null" />

</LinearLayout>

res/layout/preference_widget_switch_compat.xml

+2 −3
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@ 
     SPDX-FileCopyrightText: 2023 The Android Open Source Project

     SPDX-License-Identifier: Apache-2.0

-->

<com.google.android.material.materialswitch.MaterialSwitch

<Switch

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

    android:id="@+id/switchWidget"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@null"

    android:clickable="false"

    android:focusable="false"

    android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
 
    android:focusable="false" />

res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    </style>



    <style name="OnBoardingStyle" parent="Theme.AppCompat.DayNight">

        <item name="colorAccent">#167c80</item>

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

        <item name="windowActionBar">false</item>

        <item name="windowNoTitle">true</item>

    </style>
@@ -43,7 +43,7 @@ 


    <style name="PrimaryButtonStyle" parent="ThemeOverlay.Material3.Button">

        <item name="android:background">@drawable/button_background</item>

        <item name="android:textColor">@android:color/black</item>

        <item name="android:textColor">?android:attr/colorBackground</item>

    </style>



</resources>