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

Commit 219b399b authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 91fadd24 67527f30

Android.bp

+1 −2
Original line number Diff line number Diff line 
android_app {

    name: "DeskClock",

    resource_dirs: ["res"],

    sdk_version: "current",

    overrides: ["AlarmClock"],

    srcs: [

        "src/**/*.java",

        "gen/**/*.java",

    ],

    platform_apis: true,

    product_specific: true,

    static_libs: [

        "androidx.annotation_annotation",
@@ -25,7 +25,6 @@ android_app { 
        "androidx.appcompat_appcompat",

        "androidx.gridlayout_gridlayout",

        "androidx.recyclerview_recyclerview",

        "org.lineageos.platform.internal",

    ],

    required: [

        "com.android.deskclock_whitelist"

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ 
            android:excludeFromRecents="true"

            android:resizeableActivity="false"

            android:showOnLockScreen="true"

	    android:showWhenLocked="true"

            android:taskAffinity=""

            android:windowSoftInputMode="stateAlwaysHidden" />

res/layout/alarm_volume_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <com.android.internal.widget.PreferenceImageView

        <androidx.preference.internal.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="24dp"

            android:layout_height="24dp"/>
@@ -70,7 +70,7 @@ 
            android:orientation="vertical">



            <SeekBar

                android:id="@*android:id/seekbar"

                android:id="@+id/seekbar"

                android:layout_gravity="center_vertical"

                android:paddingStart="12dp"

                android:layout_width="match_parent"

src/com/android/deskclock/DeskClock.java

+1 −1
Original line number Diff line number Diff line
@@ -303,9 +303,9 @@ public class DeskClock extends BaseActivity 


    @Override

    protected void onStart() {

        super.onStart();

        DataModel.getDataModel().addSilentSettingsListener(mSilentSettingChangeWatcher);

        DataModel.getDataModel().setApplicationInForeground(true);

        super.onStart();

    }



    @Override

src/com/android/deskclock/NotificationUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ import android.util.Log; 
import androidx.core.app.NotificationManagerCompat;



import com.android.deskclock.Utils;

import com.android.deskclock.alarms.AlarmNotifications;

import com.android.deskclock.data.StopwatchNotificationBuilder;

import com.android.deskclock.data.TimerNotificationBuilder;



import java.util.HashMap;

import java.util.Map;