SystemUI: Register content observer for clock AM/PM style (403eae65) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+30 −5

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.TypedArray;
		import android.database.ContentObserver;
		import android.graphics.Rect;
		import android.icu.text.DateTimePatternGenerator;
		import android.os.Bundle;
		@@ -58,6 +59,8 @@ import com.android.systemui.statusbar.policy.ConfigurationController.Configurati
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.tuner.TunerService.Tunable;

		import lineageos.providers.LineageSettings;

		import java.text.SimpleDateFormat;
		import java.util.ArrayList;
		import java.util.Calendar;
		@@ -101,7 +104,8 @@ public class Clock extends TextView implements
		private static final int AM_PM_STYLE_SMALL = 1;
		private static final int AM_PM_STYLE_GONE = 2;

		private final int mAmPmStyle;
		private int mAmPmStyle = AM_PM_STYLE_GONE;
		private ContentObserver mContentObserver;
		private boolean mShowSeconds;
		private Handler mSecondsHandler;

		@@ -137,7 +141,20 @@ public class Clock extends TextView implements
		R.styleable.Clock,
		0, 0);
		try {
		mAmPmStyle = a.getInt(R.styleable.Clock_amPmStyle, AM_PM_STYLE_GONE);
		mAmPmStyle = LineageSettings.System.getInt(mContext.getContentResolver(),
		LineageSettings.System.STATUS_BAR_AM_PM, AM_PM_STYLE_GONE);
		mContentObserver = new ContentObserver(null) {
		@Override
		public void onChange(boolean selfChange) {
		mAmPmStyle = LineageSettings.System.getInt(
		mContext.getContentResolver(),
		LineageSettings.System.STATUS_BAR_AM_PM, AM_PM_STYLE_GONE);
		// Force refresh of dependent variables.
		mContentDescriptionFormatString = "";
		mDateTimePatternGenerator = null;
		updateClock(true);
		}
		};
		mNonAdaptedColor = getCurrentTextColor();
		} finally {
		a.recycle();
		@@ -201,6 +218,9 @@ public class Clock extends TextView implements
		mBroadcastDispatcher.registerReceiverWithHandler(mIntentReceiver, filter,
		Dependency.get(Dependency.TIME_TICK_HANDLER), UserHandle.ALL);
		Dependency.get(TunerService.class).addTunable(this, CLOCK_SECONDS);
		mContext.getContentResolver().registerContentObserver(
		LineageSettings.System.getUriFor(LineageSettings.System.STATUS_BAR_AM_PM),
		false, mContentObserver);
		mCommandQueue.addCallback(this);
		mUserTracker.addCallback(mUserChangedCallback, mContext.getMainExecutor());
		mCurrentUserId = mUserTracker.getUserId();
		@@ -231,6 +251,7 @@ public class Clock extends TextView implements
		if (mAttached) {
		mBroadcastDispatcher.unregisterReceiver(mIntentReceiver);
		mAttached = false;
		mContext.getContentResolver().unregisterContentObserver(mContentObserver);
		Dependency.get(TunerService.class).removeTunable(this);
		mCommandQueue.removeCallback(this);
		mUserTracker.removeCallback(mUserChangedCallback);
		@@ -299,19 +320,23 @@ public class Clock extends TextView implements
		super.setVisibility(visibility);
		}

		final void updateClock() {
		if (mDemoMode) return;
		final void updateClock(boolean forceTextUpdate) {
		if (mDemoMode \|\| mCalendar == null) return;
		mCalendar.setTimeInMillis(System.currentTimeMillis());
		CharSequence smallTime = getSmallTime();
		// Setting text actually triggers a layout pass (because the text view is set to
		// wrap_content width and TextView always relayouts for this). Avoid needless
		// relayout if the text didn't actually change.
		if (!TextUtils.equals(smallTime, getText())) {
		if (forceTextUpdate \|\| !TextUtils.equals(smallTime, getText())) {
		setText(smallTime);
		}
		setContentDescription(mContentDescriptionFormat.format(mCalendar.getTime()));
		}

		final void updateClock() {
		updateClock(false);
		}

		/**
		* In order to avoid the clock growing and shrinking due to proportional fonts, we want to
		* cache the drawn width at a given number of characters (removing the cache when it changes),