Merge "Refresh should always update the field" into qt-dev (b87abd1b) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextClock.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,9 @@ public class TextClock extends TextView {
	if (mTimeZone == null && Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) {		if (mTimeZone == null && Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) {
	final String timeZone = intent.getStringExtra("time-zone");		final String timeZone = intent.getStringExtra("time-zone");
	createTime(timeZone);		createTime(timeZone);
			} else if (!mShouldRunTicker && (Intent.ACTION_TIME_TICK.equals(intent.getAction())
			\|\| Intent.ACTION_TIME_CHANGED.equals(intent.getAction()))) {
			return;
	}		}
	onTimeChanged();		onTimeChanged();
	}		}
	@@ -642,13 +645,10 @@ public class TextClock extends TextView {
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	private void onTimeChanged() {		private void onTimeChanged() {
	// mShouldRunTicker always equals the last value passed into onVisibilityAggregated
	if (mShouldRunTicker) {
	mTime.setTimeInMillis(System.currentTimeMillis());		mTime.setTimeInMillis(System.currentTimeMillis());
	setText(DateFormat.format(mFormat, mTime));		setText(DateFormat.format(mFormat, mTime));
	setContentDescription(DateFormat.format(mDescFormat, mTime));		setContentDescription(DateFormat.format(mDescFormat, mTime));
	}		}
	}

	/** @hide */		/** @hide */
	@Override		@Override