am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev

* commit 'e31d13eab55c0c8e7b9eee93ed9d06e5328614eb':
  Notification: Reset chronometer visibility
This commit is contained in:
Christoph Studer
2014-09-12 18:52:03 +00:00
committed by Android Git Automerger

View File

@@ -2680,6 +2680,8 @@ public class Notification implements Parcelable
contentView.setViewVisibility(R.id.line3, View.GONE);
contentView.setViewVisibility(R.id.overflow_divider, View.GONE);
contentView.setViewVisibility(R.id.progress, View.GONE);
contentView.setViewVisibility(R.id.chronometer, View.GONE);
contentView.setViewVisibility(R.id.time, View.GONE);
}
private RemoteViews applyStandardTemplate(int resId) {
@@ -2775,8 +2777,6 @@ public class Notification implements Parcelable
contentView.setViewVisibility(R.id.time, View.VISIBLE);
contentView.setLong(R.id.time, "setTime", mWhen);
}
} else {
contentView.setViewVisibility(R.id.time, View.GONE);
}
// Adjust padding depending on line count and font size.