From aedebda776ee3a68eda498a79bf14855e5f5d62e Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Mon, 14 Jul 2014 14:36:32 -0400 Subject: [PATCH] Update data limit notification icon + strings. - Use a more specific disabled cellular data icon. - Reword framework strings to use "Cellular" instead of "Mobile" and avoid "enabled/disabled" - Update SystemUI's network limit dialog to follow suit. Bug:16185238 Change-Id: Ie9191990fab17cd7dc04395fad39f84bfff8349d --- .../res/res/drawable-hdpi/stat_notify_disabled.png | Bin 1014 -> 0 bytes .../res/res/drawable-mdpi/stat_notify_disabled.png | Bin 729 -> 0 bytes .../res/drawable-xhdpi/stat_notify_disabled.png | Bin 1406 -> 0 bytes .../res/drawable-xxhdpi/stat_notify_disabled.png | Bin 1299 -> 0 bytes .../res/res/drawable/stat_notify_disabled_data.xml | 37 +++++++++++++++++++++ core/res/res/values/strings.xml | 22 ++++-------- core/res/res/values/symbols.xml | 2 +- packages/SystemUI/res/values/strings.xml | 12 +++---- .../server/net/NetworkPolicyManagerService.java | 4 ++- 9 files changed, 53 insertions(+), 24 deletions(-) delete mode 100644 core/res/res/drawable-hdpi/stat_notify_disabled.png delete mode 100644 core/res/res/drawable-mdpi/stat_notify_disabled.png delete mode 100644 core/res/res/drawable-xhdpi/stat_notify_disabled.png delete mode 100644 core/res/res/drawable-xxhdpi/stat_notify_disabled.png create mode 100644 core/res/res/drawable/stat_notify_disabled_data.xml diff --git a/core/res/res/drawable-hdpi/stat_notify_disabled.png b/core/res/res/drawable-hdpi/stat_notify_disabled.png deleted file mode 100644 index c5e591797c6399475bc2ca868e732fe086c7c890..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTQPZ!4!kK=2no$U@yl{s#I-ZI>~Q&Re*fFxGf7u8PmgeJ7b~Cf zuzVfUgh~3Ws|}RY*b49T+dNgSKED6ot2+0iM^x6uO9}fNHLZKbYr4Ju$tzWUi6!Eq zRe$_X+&FhVM@?Oz;r5xL$(8e-v&N<7ZcIMp`K@s3lr_f>9-8IyC**8w$oq;jvVBv3 zOUabZj{n&|YvuG>U!Ux-(2WNdXWhQTy1&GUXX@dn_II8X-qu?czH5b^n&|Q??yp$y zYufqqvNAcFHt%1-f2DYx{`S{N_rk@mY|ayip6dPgq{Wi7XWOpMf4x9q--|t~>URX@ zm&3lH|J9?YF3x+c|Y4ZLF~%>u8vod!iFwqmT;%Nny6@~p3|8<_u{2x z67x^YD_!!b!a&V*N6;UKtC@z5HOD@$s*Ag2%%UcCX~ySQrtV2SaoZQC?Gt@$DzdES z?f0x_*Envie&rhOdc5t3%WM0PuMH{()ELq#Bi7H3`YQWKBRA}ma`g$$CtFpG8P+r} z`Blc}u`AVBLim(x_@i%vBJQgd3;Yk6xCL=OwwNG1t&#IU)x5V&|Ck=6hUs6P#gL=O zaDC;{`0ZkvvJ+O$>sj{5aBJ|g{WcTgJJu!|gsxowE$O>MnfH?><)bevjMUcMUizwh zqsuGT-<>?2oNUqm!t`%-{Bk?H=e@R^3{$iAk^bsbl`89prlHSkGVBbFs6Mm3T~^h) zR(osrv$R)Rv}euWnsh_xe%ZY}np>Av2e$@)pCdAv@zMU2boFyt=akR{04Wo`Hvj+t diff --git a/core/res/res/drawable-mdpi/stat_notify_disabled.png b/core/res/res/drawable-mdpi/stat_notify_disabled.png deleted file mode 100644 index c03277c194a2c72351acdb731affefdf39f1ccb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 729 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 JPDHLkV1gmSFT?-< diff --git a/core/res/res/drawable/stat_notify_disabled_data.xml b/core/res/res/drawable/stat_notify_disabled_data.xml new file mode 100644 index 000000000000..d287a75b27f8 --- /dev/null +++ b/core/res/res/drawable/stat_notify_disabled_data.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 0285f54c3167..24926893df22 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3979,16 +3979,6 @@ Skip - - - High mobile data use - Touch to learn more about mobile data use. - - - - Mobile data limit exceeded - Touch to learn more about mobile data use. - No matches @@ -4198,22 +4188,22 @@ Touch to view usage and settings. - 2G-3G data disabled + 2G-3G data is off - 4G data disabled + 4G data is off - Mobile data disabled + Cellular data is off - Wi-Fi data disabled + Wi-Fi data is off - Touch to enable. + Limit reached 2G-3G data limit exceeded 4G data limit exceeded - Mobile data limit exceeded + Cellular data limit exceeded Wi-Fi data limit exceeded diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 46e019458d66..e19231b037ec 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1502,7 +1502,7 @@ - + diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 751c8892bf73..28b085353919 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -416,17 +416,17 @@ Less time - 2G-3G data disabled + 2G-3G data is off - 4G data disabled + 4G data is off - Mobile data disabled + Cellular data is off - Data disabled + Data is off - You\'ve reached the specified data usage limit.\n\nIf you re-enable data, you may be charged by the operator. + Your device turned off data because it reached the limit you set.\n\nTurning it back on may lead to charges from your carrier. - Re-enable data + Turn on data diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index f0ec3bbedc96..0da1fa4ecdcd 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -815,6 +815,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final CharSequence body = res.getText(R.string.data_usage_limit_body); final CharSequence title; + int icon = R.drawable.stat_notify_disabled_data; switch (policy.template.getMatchRule()) { case MATCH_MOBILE_3G_LOWER: title = res.getText(R.string.data_usage_3g_limit_title); @@ -827,6 +828,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { break; case MATCH_WIFI: title = res.getText(R.string.data_usage_wifi_limit_title); + icon = R.drawable.stat_notify_error; break; default: title = null; @@ -834,7 +836,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } builder.setOngoing(true); - builder.setSmallIcon(R.drawable.stat_notify_disabled); + builder.setSmallIcon(icon); builder.setTicker(title); builder.setContentTitle(title); builder.setContentText(body); -- 2.11.0