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

Merge "Make NetworkOverLimitActivity and DataUsageSummaryActivity configurable" into cw-f-dev

Browse Source
This commit is contained in:
Wei Liu
2016-08-02 18:25:00 +00:00
committed by Android (Google) Code Review
parent 9fd7fccc22 546cb77123
commit d752f11926
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2513,4 +2513,7 @@
Note: Also update appropriate overlay files. --> Note: Also update appropriate overlay files. -->
<string-array translatable="false" name="config_defaultFirstUserRestrictions"> <string-array translatable="false" name="config_defaultFirstUserRestrictions">
</string-array> </string-array>
<string name="config_networkOverLimitComponent" translatable="false">com.android.systemui/com.android.systemui.net.NetworkOverLimitActivity</string>
<string name="config_dataUsageSummaryComponent" translatable="false">com.android.settings/com.android.settings.Settings$DataUsageSummaryActivity</string>
</resources> </resources>

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

@@ -2646,6 +2646,10 @@
<!-- Colon separated list of package names that should be granted DND access --> <!-- Colon separated list of package names that should be granted DND access -->
<java-symbol type="string" name="config_defaultDndAccessPackages" /> <java-symbol type="string" name="config_defaultDndAccessPackages" />
<!-- For NetworkPolicyManagerService -->
<java-symbol type="string" name="config_networkOverLimitComponent" />
<java-symbol type="string" name="config_dataUsageSummaryComponent" />
<java-symbol type="string" name="lockscreen_storage_locked" /> <java-symbol type="string" name="lockscreen_storage_locked" />
<!-- Used for MimeIconUtils. --> <!-- Used for MimeIconUtils. -->

20
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -1035,7 +1035,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
*/ */
private void notifyOverLimitNL(NetworkTemplate template) { private void notifyOverLimitNL(NetworkTemplate template) {
if (!mOverLimitNotified.contains(template)) { if (!mOverLimitNotified.contains(template)) {
mContext.startActivity(buildNetworkOverLimitIntent(template)); mContext.startActivity(buildNetworkOverLimitIntent(mContext.getResources(), template));
mOverLimitNotified.add(template); mOverLimitNotified.add(template);
} }
} }
@@ -1079,7 +1079,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setDeleteIntent(PendingIntent.getBroadcast( builder.setDeleteIntent(PendingIntent.getBroadcast(
mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT)); mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT));
final Intent viewIntent = buildViewDataUsageIntent(policy.template); final Intent viewIntent = buildViewDataUsageIntent(res, policy.template);
builder.setContentIntent(PendingIntent.getActivity( builder.setContentIntent(PendingIntent.getActivity(
mContext, 0, viewIntent, PendingIntent.FLAG_UPDATE_CURRENT)); mContext, 0, viewIntent, PendingIntent.FLAG_UPDATE_CURRENT));
@@ -1115,7 +1115,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setContentTitle(title); builder.setContentTitle(title);
builder.setContentText(body); builder.setContentText(body);
final Intent intent = buildNetworkOverLimitIntent(policy.template); final Intent intent = buildNetworkOverLimitIntent(res, policy.template);
builder.setContentIntent(PendingIntent.getActivity( builder.setContentIntent(PendingIntent.getActivity(
mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)); mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT));
break; break;
@@ -1150,7 +1150,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setContentTitle(title); builder.setContentTitle(title);
builder.setContentText(body); builder.setContentText(body);
final Intent intent = buildViewDataUsageIntent(policy.template); final Intent intent = buildViewDataUsageIntent(res, policy.template);
builder.setContentIntent(PendingIntent.getActivity( builder.setContentIntent(PendingIntent.getActivity(
mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)); mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT));
break; break;
@@ -3519,19 +3519,19 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
return intent; return intent;
} }
private static Intent buildNetworkOverLimitIntent(NetworkTemplate template) { private static Intent buildNetworkOverLimitIntent(Resources res, NetworkTemplate template) {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.setComponent(new ComponentName( intent.setComponent(ComponentName.unflattenFromString(
"com.android.systemui", "com.android.systemui.net.NetworkOverLimitActivity")); res.getString(R.string.config_networkOverLimitComponent)));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
return intent; return intent;
} }
private static Intent buildViewDataUsageIntent(NetworkTemplate template) { private static Intent buildViewDataUsageIntent(Resources res, NetworkTemplate template) {
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.setComponent(new ComponentName( intent.setComponent(ComponentName.unflattenFromString(
"com.android.settings", "com.android.settings.Settings$DataUsageSummaryActivity")); res.getString(R.string.config_dataUsageSummaryComponent)));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
return intent; return intent;