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

Commit a57b67ba authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'issue_1922_q' into 'v1-q' 

Issue 1922 q

See merge request !14
parents 3245eb23 738329bd

res/drawable/ic_tab_alarm_static.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
        android:height="24dp"

        android:tint="@color/tab_tint_color"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

        android:viewportWidth="24.0"



    >

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />

res/drawable/thumb_selector.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    <item android:state_checked="false">

        <shape android:shape="oval">

            <solid android:color="@android:color/white" />

            <size android:width="20dp" android:height="20dp" />

            <stroke android:width="2dp" android:color="#0000ffff" />

        </shape> <!-- shape circle -->

    </item>

</selector>

res/drawable/track_selector.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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



    <item android:state_checked="true">

        <shape android:shape="rectangle">

            <size android:width="36dp" android:height="20dp"/>

            <solid android:width="1dp" android:color="@color/color_default_blue1"/>

            <corners android:radius="50dp"/>

        </shape>

    </item>



    <item android:state_checked="false">

        <shape android:shape="rectangle">

            <size android:width="36dp" android:height="20dp"/>

            <solid android:width="1dp" android:color="@android:color/darker_gray"/>

            <corners android:radius="50dp"/>

        </shape>

    </item>



</selector>

res/layout/alarm_time_collapsed.xml

+7 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
        app:layout_gravity="center_vertical"

        app:layout_row="0" />



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

    <androidx.appcompat.widget.SwitchCompat

        android:id="@+id/onoff"

        android:layout_width="wrap_content"
@@ -43,11 +44,15 @@ 
        android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

        android:minHeight="@dimen/touch_target_min_size"

        android:minWidth="@dimen/touch_target_min_size"

        android:theme="@style/ThemeOverlay.Control.Accent"



        app:layout_column="3"

        app:layout_columnSpan="2"

        app:layout_gravity="center_vertical"

        app:layout_row="0" />

        app:layout_row="0"



        android:thumb="@drawable/thumb_selector"

        app:track="@drawable/track_selector"

        />



    <com.android.deskclock.widget.EllipsizeLayout

        android:layout_width="0dp"

res/layout/alarm_time_expanded.xml

+9 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
        app:layout_gravity="center_vertical"

        app:layout_row="0" />



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

    <androidx.appcompat.widget.SwitchCompat

        android:id="@+id/onoff"

        android:layout_width="wrap_content"
@@ -43,11 +44,17 @@ 
        android:layout_marginTop="@dimen/alarm_clock_vertical_margin"

        android:minHeight="@dimen/touch_target_min_size"

        android:minWidth="@dimen/touch_target_min_size"

        android:theme="@style/ThemeOverlay.Control.Accent"



        app:layout_column="6"

        app:layout_columnSpan="2"

        app:layout_gravity="center_vertical"

        app:layout_row="0" />

        app:layout_row="0"





        android:thumb="@drawable/thumb_selector"

        app:track="@drawable/track_selector"

        />





    <CheckBox

        android:id="@+id/repeat_onoff"