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

Merge "Make notification match the mocks." into rvc-dev am: 1d5934de3d am: 4c2f056a3b

Browse Source 
Change-Id: Id99c2d231ba1f48f822200debfd9a2aa01e79850
This commit is contained in:
TreeHugger Robot
2020-05-11 14:17:35 +00:00
committed by Automerger Merge Worker
parent d33a660cd1 4c2f056a3b
commit 80eeb99531
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-night/colors.xml
View File

@@ -35,4 +35,6 @@
<color name="resolver_empty_state_text">#FFFFFF</color>
<color name="resolver_empty_state_icon">#FFFFFF</color>
<color name="personal_apps_suspension_notification_color">#8AB4F8</color>
</resources>

3
core/res/res/values/colors.xml
View File

@@ -231,5 +231,8 @@
<color name="resolver_empty_state_text">#FF202124</color>
<color name="resolver_empty_state_icon">#FF5F6368</color>
<!-- Color for personal app suspension notification button text and icon tint. -->
<color name="personal_apps_suspension_notification_color">#1A73E8</color>
<color name="conversation_important_highlight">#F9AB00</color>
</resources>

3
core/res/res/values/symbols.xml
View File

@@ -1203,6 +1203,7 @@
<java-symbol type="string" name="personal_apps_suspension_tomorrow_text" />
<java-symbol type="string" name="personal_apps_suspension_text" />
<java-symbol type="string" name="personal_apps_suspended_turn_profile_on" />
<java-symbol type="string" name="notification_work_profile_content_description" />
<java-symbol type="string" name="factory_reset_warning" />
<java-symbol type="string" name="factory_reset_message" />
<java-symbol type="string" name="lockscreen_transport_play_description" />
@@ -4007,6 +4008,8 @@
<java-symbol type="string" name="notification_channel_network_alerts" />
<java-symbol type="string" name="notification_channel_network_available" />
<java-symbol type="color" name="personal_apps_suspension_notification_color" />
<!-- For Pdn throttle feature -->
<java-symbol type="bool" name="config_pdp_reject_enable_retry" />
<java-symbol type="integer" name="config_pdp_reject_retry_delay_ms" />

10
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -16150,18 +16150,24 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
? R.string.personal_apps_suspension_tomorrow_text
: R.string.personal_apps_suspension_text);
final boolean ongoing = notificationState == PROFILE_OFF_DEADLINE_REACHED;
final int color = mContext.getColor(R.color.personal_apps_suspension_notification_color);
final Bundle extras = new Bundle();
// TODO: Create a separate string for this.
extras.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,
mContext.getString(R.string.notification_work_profile_content_description));
final Notification notification =
new Notification.Builder(mContext, SystemNotificationChannels.DEVICE_ADMIN)
.setSmallIcon(android.R.drawable.stat_sys_warning)
.setSmallIcon(R.drawable.ic_corp_badge_no_background)
.setOngoing(ongoing)
.setAutoCancel(false)
.setContentTitle(mContext.getString(
R.string.personal_apps_suspension_title))
.setContentText(text)
.setStyle(new Notification.BigTextStyle().bigText(text))
.setColor(mContext.getColor(R.color.system_notification_accent_color))
.setColor(color)
.addAction(turnProfileOnButton)
.addExtras(extras)
.build();
mInjector.getNotificationManager().notify(
SystemMessage.NOTE_PERSONAL_APPS_SUSPENDED, notification);