Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert to basic icons in notification info." into qt-dev

Browse Source
This commit is contained in:
Ned Burns
2019-05-20 20:16:44 +00:00
committed by Android (Google) Code Review
parent ab9c69fda4 0ed02298e7
commit 4a58ec22e1
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/notification_info.xml
View File

@@ -228,7 +228,7 @@ asked for it -->
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:id="@+id/alert_icon" android:id="@+id/alert_icon"
android:src="@drawable/ic_notification_interruptive" android:src="@drawable/ic_notifications_alert"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -249,6 +249,7 @@ asked for it -->
android:text="@string/notification_alert_title"/> android:text="@string/notification_alert_title"/>
<TextView <TextView
android:id="@+id/alert_summary" android:id="@+id/alert_summary"
android:visibility="gone"
android:paddingTop="@dimen/notification_importance_button_padding" android:paddingTop="@dimen/notification_importance_button_padding"
android:text="@string/notification_channel_summary_default" android:text="@string/notification_channel_summary_default"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -271,7 +272,7 @@ asked for it -->
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:id="@+id/silence_icon" android:id="@+id/silence_icon"
android:src="@drawable/ic_notification_gentle" android:src="@drawable/ic_notifications_silence"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -292,6 +293,7 @@ asked for it -->
android:text="@string/notification_silence_title"/> android:text="@string/notification_silence_title"/>
<TextView <TextView
android:id="@+id/silence_summary" android:id="@+id/silence_summary"
android:visibility="gone"
android:paddingTop="@dimen/notification_importance_button_padding" android:paddingTop="@dimen/notification_importance_button_padding"
android:text="@string/notification_channel_summary_default" android:text="@string/notification_channel_summary_default"
android:layout_width="match_parent" android:layout_width="match_parent"

4
packages/SystemUI/res/values/strings.xml
View File

@@ -1656,13 +1656,13 @@
<string name="inline_minimize_button">Minimize</string> <string name="inline_minimize_button">Minimize</string>
<!-- Notification inline controls: button to show notifications silently, without alerting the user [CHAR_LIMIT=35] --> <!-- Notification inline controls: button to show notifications silently, without alerting the user [CHAR_LIMIT=35] -->
<string name="inline_silent_button_silent">Gentle</string> <string name="inline_silent_button_silent">Silent</string>
<!-- Notification inline controls: button to continue showing notifications silently [CHAR_LIMIT=35] --> <!-- Notification inline controls: button to continue showing notifications silently [CHAR_LIMIT=35] -->
<string name="inline_silent_button_stay_silent">Stay silent</string> <string name="inline_silent_button_stay_silent">Stay silent</string>
<!-- Notification inline controls: button to make notifications alert the user [CHAR_LIMIT=35] --> <!-- Notification inline controls: button to make notifications alert the user [CHAR_LIMIT=35] -->
<string name="inline_silent_button_alert">Interruptive</string> <string name="inline_silent_button_alert">Alerting</string>
<!-- Notification inline controls: button to continue alerting the user when notifications arrive [CHAR_LIMIT=35] --> <!-- Notification inline controls: button to continue alerting the user when notifications arrive [CHAR_LIMIT=35] -->
<string name="inline_silent_button_keep_alerting">Keep alerting</string> <string name="inline_silent_button_keep_alerting">Keep alerting</string>

40
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
View File

@@ -94,6 +94,8 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
private static final int BUTTON_ANIM_TIME_MS = 200; private static final int BUTTON_ANIM_TIME_MS = 200;
private static final boolean SHOW_BUTTON_SUMMARY = false;
private INotificationManager mINotificationManager; private INotificationManager mINotificationManager;
private PackageManager mPm; private PackageManager mPm;
private MetricsLogger mMetricsLogger; private MetricsLogger mMetricsLogger;
@@ -580,25 +582,27 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
transition.setDuration(BUTTON_ANIM_TIME_MS); transition.setDuration(BUTTON_ANIM_TIME_MS);
TransitionManager.beginDelayedTransition(this, transition); TransitionManager.beginDelayedTransition(this, transition);
} }
if (blockState == ACTION_ALERT) { if (SHOW_BUTTON_SUMMARY) {
TextView view = findViewById(R.id.alert_summary); if (blockState == ACTION_ALERT) {
view.setVisibility(VISIBLE); TextView view = findViewById(R.id.alert_summary);
findViewById(R.id.silence_summary).setVisibility(GONE); view.setVisibility(VISIBLE);
view.setText(R.string.notification_channel_summary_default); findViewById(R.id.silence_summary).setVisibility(GONE);
} else { view.setText(R.string.notification_channel_summary_default);
TextView view = findViewById(R.id.silence_summary);
view.setVisibility(VISIBLE);
findViewById(R.id.alert_summary).setVisibility(GONE);
if (mShowInStatusBar) {
if (mShowOnLockscreen) {
view.setText(R.string.notification_channel_summary_low_status_lock);
} else {
view.setText(R.string.notification_channel_summary_low_status);
}
} else if (mShowOnLockscreen) {
view.setText(R.string.notification_channel_summary_low_lock);
} else { } else {
view.setText(R.string.notification_channel_summary_low); TextView view = findViewById(R.id.silence_summary);
view.setVisibility(VISIBLE);
findViewById(R.id.alert_summary).setVisibility(GONE);
if (mShowInStatusBar) {
if (mShowOnLockscreen) {
view.setText(R.string.notification_channel_summary_low_status_lock);
} else {
view.setText(R.string.notification_channel_summary_low_status);
}
} else if (mShowOnLockscreen) {
view.setText(R.string.notification_channel_summary_low_lock);
} else {
view.setText(R.string.notification_channel_summary_low);
}
} }
} }
} }