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

Commit 23a4d865 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents b262597d 2828ae1a

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ android_app { 
        "androidx.collection_collection",

        "androidx.arch.core_core-common",

        "androidx.lifecycle_lifecycle-common",

        

        "com.google.android.material_material",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.transition_transition",

        "androidx.core_core",

res/layout/alarm_time_collapsed.xml

+5 −2
Original line number Diff line number Diff line
@@ -67,15 +67,18 @@ 
        app:layout_constraintTop_toTopOf="parent"

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



    <androidx.appcompat.widget.SwitchCompat

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

        android:id="@+id/onoff"

        style="@style/DeskClock.Switch"

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="6.0dip"

        android:focusable="true"

        android:minWidth="@dimen/touch_target_min_size"

        android:minHeight="@dimen/touch_target_min_size"

        android:text=""

        android:textOn=""

        android:textOff=""

        app:layout_constraintEnd_toStartOf="@id/end_guide_thin"

        app:layout_constraintTop_toBottomOf="@id/digital_clock" />

res/layout/alarm_time_expanded.xml

+5 −2
Original line number Diff line number Diff line
@@ -69,15 +69,18 @@ 
        app:layout_constraintTop_toTopOf="parent"

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



    <androidx.appcompat.widget.SwitchCompat

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

        android:id="@+id/onoff"

        style="@style/DeskClock.Switch"

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="6.0dip"

        android:focusable="true"

        android:minWidth="@dimen/touch_target_min_size"

        android:minHeight="@dimen/touch_target_min_size"

        android:text=""

        android:textOn=""

        android:textOff=""

        app:layout_constraintEnd_toStartOf="@id/end_guide_thin"

        app:layout_constraintTop_toBottomOf="@id/digital_clock" />

res/layout/preference_widget_switch_compat.xml

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

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

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

    android:id="@+id/switchWidget"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:clickable="false"

    android:focusable="false"

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

res/layout/timer_item.xml

+4 −3
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    xmlns:tools="http://schemas.android.com/tools"

    style="@style/MaterialCardViewStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginStart="8dp"

    android:layout_marginEnd="8dp"

    android:layout_marginBottom="8dp"

    android:background="@drawable/alarm_background"

    android:padding="16dp">
@@ -68,7 +67,9 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toStartOf="@id/add_one_min"

        app:layout_constraintTop_toBottomOf="@id/timer_label"

        app:layout_constraintBottom_toBottomOf="parent">

        app:layout_constraintBottom_toBottomOf="parent"

        android:layout_marginTop="8dp"

        android:layout_marginEnd="16dp">



        <com.android.deskclock.timer.TimerCircleView

            android:id="@+id/timer_time"