diff options
| author | Colin Marsch <colinmarsch@google.com> | 2020-08-18 16:53:25 -0500 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-08 19:39:11 +0200 |
| commit | a62e7790816bbc2b0d8f58adae849266b35de5eb (patch) | |
| tree | daa0bc1970d69425411bfc5849e046a658cd37d5 | |
| parent | 0cbc389d4a58361534a6a548d67c6de5dcf63ecd (diff) | |
AOSP/DeskClock - Clean up some TODOs and deprecated calls
Test: manual, tested the DeskClock UI. As well tests were ran as follows
$ source build/envsetup.sh
$ lunch aosp_sargo-userdebug
$ make DeskClock
$ adb install out/target/product/sargo/product/app/DeskClock/DeskClock.apk
$ atest DeskClockTests
$ make DeskClockJava
$ adb install out/target/product/sargo/product/app/DeskClockJava/DeskClockJava.apk
$ atest DeskClockTests
BUG: 157255731
Change-Id: I4fafbc1021102dc7da7ad592a8840a9220d320cd
| -rw-r--r-- | src/com/android/deskclock/alarms/AlarmActivity.java | 17 | ||||
| -rw-r--r-- | src/com/android/deskclock/widget/TextTime.java | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java index 916fb9274..9d200d40b 100644 --- a/src/com/android/deskclock/alarms/AlarmActivity.java +++ b/src/com/android/deskclock/alarms/AlarmActivity.java @@ -176,11 +176,18 @@ public class AlarmActivity extends BaseActivity // Get the volume/camera button behavior setting mVolumeBehavior = DataModel.getDataModel().getAlarmVolumeButtonBehavior(); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED - | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD - | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON - | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); + if (Utils.isOOrLater()) { + setShowWhenLocked(true); + setTurnScreenOn(true); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); + } else { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED + | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD + | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON); + } // Hide navigation bar to minimize accidental tap on Home key hideNavigationBar(); diff --git a/src/com/android/deskclock/widget/TextTime.java b/src/com/android/deskclock/widget/TextTime.java index 3e93124da..e0cea474b 100644 --- a/src/com/android/deskclock/widget/TextTime.java +++ b/src/com/android/deskclock/widget/TextTime.java @@ -21,6 +21,7 @@ import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import android.os.Looper; import android.provider.Settings; import androidx.annotation.VisibleForTesting; import android.text.format.DateFormat; @@ -59,7 +60,8 @@ public class TextTime extends TextView { private int mHour; private int mMinute; - private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) { + private final ContentObserver mFormatChangeObserver = + new ContentObserver(new Handler(Looper.myLooper())) { @Override public void onChange(boolean selfChange) { chooseFormat(); |