PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove explicit number from string" into udc-dev am: fe310a86de

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609

Change-Id: I0eb6052b993ac3d1d3c8fb49e2dee68ef19b4bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2023-03-16 20:06:51 +00:00
committed by Automerger Merge Worker
parent d0db72339d fe310a86de
commit bf920a9e6b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/notification_history.xml
View File

@@ -186,9 +186,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/today_header"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/notification_history_today"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textAppearance="@style/TextAppearance.HomepageCardTitle" android:textAppearance="@style/TextAppearance.HomepageCardTitle"
android:paddingBottom="16dp" /> android:paddingBottom="16dp" />

2
res/values/strings.xml
View File

@@ -5722,7 +5722,7 @@
<string name="notification_log_title">Notification log</string> <string name="notification_log_title">Notification log</string>
<string name="notification_history_title">Notification history</string> <string name="notification_history_title">Notification history</string>
<string name="notification_history_today">Last 24 hours</string> <string name="notification_history_today">Last %d hours</string>
<string name="notification_history_snooze">Snoozed</string> <string name="notification_history_snooze">Snoozed</string>
<string name="notification_history_dismiss">Recently dismissed</string> <string name="notification_history_dismiss">Recently dismissed</string>

3
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -78,6 +78,7 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
// R.integer.config_notificationServiceArchiveSize, which is the Number of notifications kept // R.integer.config_notificationServiceArchiveSize, which is the Number of notifications kept
// in the notification service historical archive // in the notification service historical archive
private static final int MAX_RECENT_DISMISS_ITEM_COUNT = 50; private static final int MAX_RECENT_DISMISS_ITEM_COUNT = 50;
private static final int HISTORY_HOURS = 24;
private ViewGroup mHistoryOn; private ViewGroup mHistoryOn;
private ViewGroup mHistoryOff; private ViewGroup mHistoryOff;
@@ -243,6 +244,8 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
mHistoryOn = findViewById(R.id.history_on); mHistoryOn = findViewById(R.id.history_on);
mHistoryEmpty = findViewById(R.id.history_on_empty); mHistoryEmpty = findViewById(R.id.history_on_empty);
mSwitchBar = findViewById(R.id.main_switch_bar); mSwitchBar = findViewById(R.id.main_switch_bar);
((TextView) findViewById(R.id.today_header)).setText(
getString(R.string.notification_history_today, HISTORY_HOURS));
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();
if (actionBar != null) { if (actionBar != null) {