Merge "Fixed a bug where the chronometer was invisible" into nyc-dev (2486cb2c) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -3369,7 +3369,7 @@ public class Notification implements Parcelable
		* otherwise
		*/
		private boolean showsTimeOrChronometer() {
		return mN.showsTimeOrChronometer();
		return mN.showsTime() \|\| mN.showsChronometer();
		}

		private void resetStandardTemplateWithActions(RemoteViews big) {
		@@ -3865,14 +3865,21 @@ public class Notification implements Parcelable
		}

		/**
		* @return true if the notification will show the time or the chronometer; false
		* otherwise
		* @return true if the notification will show the time; false otherwise
		* @hide
		*/
		public boolean showsTimeOrChronometer() {
		public boolean showsTime() {
		return when != 0 && extras.getBoolean(EXTRA_SHOW_WHEN);
		}

		/**
		* @return true if the notification will show a chronometer; false otherwise
		* @hide
		*/
		public boolean showsChronometer() {
		return when != 0 && extras.getBoolean(EXTRA_SHOW_CHRONOMETER);
		}

		/**
		* An object that can apply a rich notification style to a {@link Notification.Builder}
		* object.

+1 −1

Original line number	Diff line number	Diff line
		@@ -198,7 +198,7 @@ public class NotificationHeaderUtil {
		}
		// in case no view is visible we make sure the time is visible
		int timeVisibility = !hasVisibleText
		\|\| mRow.getStatusBarNotification().getNotification().showsTimeOrChronometer()
		\|\| mRow.getStatusBarNotification().getNotification().showsTime()
		? View.VISIBLE : View.GONE;
		time.setVisibility(timeVisibility);
		View left = null;