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

Commit c2e75df2 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'fix-2393-pie' into 'v1-pie' 

Change compat Switch to framework default Switch

See merge request !17
parents 9e281d9c ffc1fe35

res/layout/alarm_time_collapsed.xml

+1 −5
Original line number Diff line number Diff line
@@ -37,21 +37,17 @@ 
        app:layout_row="0" />



    <!--android:theme="@style/ThemeOverlay.Control.Accent"-->

    <android.support.v7.widget.SwitchCompat

    <Switch

        android:id="@+id/onoff"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

        android:minHeight="@dimen/touch_target_min_size"

        android:minWidth="@dimen/touch_target_min_size"



        app:layout_column="3"

        app:layout_columnSpan="2"

        app:layout_gravity="center_vertical"

        app:layout_row="0"



        android:thumb="@drawable/thumb_selector"

        app:track="@drawable/track_selector"

        />



    <com.android.deskclock.widget.EllipsizeLayout

res/layout/alarm_time_expanded.xml

+1 −6
Original line number Diff line number Diff line
@@ -36,22 +36,17 @@ 
        app:layout_gravity="center_vertical"

        app:layout_row="0" />

   <!-- android:theme="@style/ThemeOverlay.Control.Accent"-->

    <android.support.v7.widget.SwitchCompat

    <Switch

        android:id="@+id/onoff"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

        android:minHeight="@dimen/touch_target_min_size"

        android:minWidth="@dimen/touch_target_min_size"



        app:layout_column="6"

        app:layout_columnSpan="2"

        app:layout_gravity="center_vertical"

        app:layout_row="0"





        android:thumb="@drawable/thumb_selector"

        app:track="@drawable/track_selector"

        />



    <CheckBox

res/xml/settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
            android:key="clock_style"

            android:title="@string/clock_style" />



        <SwitchPreferenceCompat

        <SwitchPreference

            android:key="display_clock_seconds"

            android:title="@string/display_clock_seconds_pref" />



        <SwitchPreferenceCompat

        <SwitchPreference

            android:defaultValue="true"

            android:key="automatic_home_clock"

            android:summary="@string/automatic_home_clock_summary"
@@ -125,7 +125,7 @@ 
            android:title="@string/crescendo_duration_title" />





        <SwitchPreferenceCompat

        <SwitchPreference

            android:defaultValue="false"

            android:key="timer_vibrate"

            android:title="@string/timer_vibrate_title" />