Commit 33a5b152 authored by Romain Hunault's avatar Romain Hunault
Browse files

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

Change appcompat Switch to framework default Switch

See merge request !18
parents 28b75604 57f406c3
......@@ -37,22 +37,17 @@
app:layout_row="0" />
<!--android:theme="@style/ThemeOverlay.Control.Accent"-->
<androidx.appcompat.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"
/>
app:layout_row="0" />
<com.android.deskclock.widget.EllipsizeLayout
android:layout_width="0dp"
......
......@@ -37,24 +37,17 @@
app:layout_row="0" />
<!-- android:theme="@style/ThemeOverlay.Control.Accent"-->
<androidx.appcompat.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"
/>
app:layout_row="0" />
<CheckBox
android:id="@+id/repeat_onoff"
......
......@@ -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"
......@@ -126,7 +126,7 @@
android:title="@string/crescendo_duration_title" />
<SwitchPreferenceCompat
<SwitchPreference
android:defaultValue="false"
android:key="timer_vibrate"
android:title="@string/timer_vibrate_title" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment