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

Commit 88357509 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2871-u-clock_switches' into 'v1-u' 

Use android.widget.switch instead of google material switch

See merge request !53
parents 23a4d865 0182234e

res/layout/alarm_time_collapsed.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_caret_down" />



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

    <Switch

        android:id="@+id/onoff"

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

        android:layout_width="wrap_content"

res/layout/alarm_time_expanded.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
        app:layout_constraintTop_toTopOf="parent"

        app:srcCompat="@drawable/ic_caret_up" />



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

    <Switch

        android:id="@+id/onoff"

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

        android:layout_width="wrap_content"

res/layout/preference_widget_switch_compat.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

res/layout/widget_switch_compat.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<!-- Layout used by SwitchPreference for the switch widget style. This is inflated

     inside android.R.layout.preference. -->

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

<Switch

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

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

    android:id="@+id/switchWidget"