Merge branch 'issue_1922_q' into 'v1-q'

Issue 1922 q

See merge request !14

res/drawable/ic_tab_alarm_static.xml

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

+<?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

+<?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

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

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

res/layout/desk_clock.xml

@@ -118,7 +118,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/content"
-        android:background="@color/secondary_color"
+        android:background="@color/transparent"
         app:menu="@menu/bottom_navigation_menu"
         app:itemIconTint="@color/tab_tint_color"
         app:itemTextColor="@color/tab_tint_color"

res/values/colors.xml

@@ -40,4 +40,11 @@
 
     <color name="accent_color">@lineageos.platform:color/color_default_blue1</color>
     <color name="secondary_color">#2F378A</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
+
+
+
+
 </resources>

res/values/themes.xml

@@ -63,8 +63,13 @@
     </style>
 
     <style name="ThemeOverlay.Control.Accent" parent="ThemeOverlay.AppCompat">
-        <!-- Attributes from androidx.appcompat.appcompat -->
-        <item name="colorControlActivated">?attr/colorAccent</item>
+<!--        &lt;!&ndash; active thumb & track color (30% transparency) &ndash;&gt;-->
+<!--        <item name="colorControlActivated">#e6e600</item>-->
+<!--        &lt;!&ndash; Inactive thumb color &ndash;&gt;-->
+<!--        <item name="colorSwitchThumbNormal">@color/accent_color</item>-->
+
+        <item name="trackTint">@color/accent_color</item>
+        <item name="thumbTint">@color/color_default_foreground</item>
     </style>
 
     <style name="ThemeOverlay.Popup" parent="ThemeOverlay.AppCompat">