From 3e3a08e318eaa1501faeb711b0a02caf6f8fdf2a Mon Sep 17 00:00:00 2001 From: George Mount Date: Thu, 7 Dec 2017 07:34:07 -0800 Subject: Make TextClock only listen for specific changes. Bug 68016230 Make TextClock only listen for changes to the 12/24 hour clock setting, so that it doesn't trigger a change when other settings are updated. Test: I5dee1694890ec90b0eabb939cd636971ed9ba5d4 Change-Id: Ia345995dc2f019209e3c68e6e8681cd2c9d5f439 --- core/java/android/widget/TextClock.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index 127904039506..7156300e6e47 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -570,11 +570,12 @@ public class TextClock extends TextView { mFormatChangeObserver = new FormatChangeObserver(getHandler()); } final ContentResolver resolver = getContext().getContentResolver(); + Uri uri = Settings.System.getUriFor(Settings.System.TIME_12_24); if (mShowCurrentUserTime) { - resolver.registerContentObserver(Settings.System.CONTENT_URI, true, + resolver.registerContentObserver(uri, true, mFormatChangeObserver, UserHandle.USER_ALL); } else { - resolver.registerContentObserver(Settings.System.CONTENT_URI, true, + resolver.registerContentObserver(uri, true, mFormatChangeObserver); } } -- cgit v1.2.3-59-g8ed1b