summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-10-02 16:12:05 -0700
committerIrfan Sheriff <isheriff@google.com>2012-10-02 16:50:29 -0700
commitebb8f413e63dee6d96904a49a3508b97671e5fe8 (patch)
tree77ba3c1f4e7e4264090d3ff92ff4f9db36e3ecc6 /core/java
parenta22f081ab41072b5aa8caa3d1179d2ad27a877f7 (diff)
downloadframeworks_base-ebb8f413e63dee6d96904a49a3508b97671e5fe8.zip
frameworks_base-ebb8f413e63dee6d96904a49a3508b97671e5fe8.tar.gz
frameworks_base-ebb8f413e63dee6d96904a49a3508b97671e5fe8.tar.bz2
Add icon for mobile notification
Bug: 7087564 Change-Id: If856bdfa28c024fb775fd3f8231bd5a16fef59e6
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/CaptivePortalTracker.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/net/CaptivePortalTracker.java b/core/java/android/net/CaptivePortalTracker.java
index 19ed658..ce71e6b 100644
--- a/core/java/android/net/CaptivePortalTracker.java
+++ b/core/java/android/net/CaptivePortalTracker.java
@@ -330,28 +330,32 @@ public class CaptivePortalTracker extends StateMachine {
if (visible) {
CharSequence title;
CharSequence details;
+ int icon;
switch (mNetworkInfo.getType()) {
case ConnectivityManager.TYPE_WIFI:
title = r.getString(R.string.wifi_available_sign_in, 0);
details = r.getString(R.string.network_available_sign_in_detailed,
mNetworkInfo.getExtraInfo());
+ icon = R.drawable.stat_notify_wifi_in_range;
break;
case ConnectivityManager.TYPE_MOBILE:
title = r.getString(R.string.network_available_sign_in, 0);
// TODO: Change this to pull from NetworkInfo once a printable
// name has been added to it
details = mTelephonyManager.getNetworkOperatorName();
+ icon = R.drawable.stat_notify_rssi_in_range;
break;
default:
title = r.getString(R.string.network_available_sign_in, 0);
details = r.getString(R.string.network_available_sign_in_detailed,
mNetworkInfo.getExtraInfo());
+ icon = R.drawable.stat_notify_rssi_in_range;
break;
}
Notification notification = new Notification();
notification.when = 0;
- notification.icon = com.android.internal.R.drawable.stat_notify_wifi_in_range;
+ notification.icon = icon;
notification.flags = Notification.FLAG_AUTO_CANCEL;
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mUrl));
intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT |