diff --git a/core/java/android/net/CaptivePortalTracker.java b/core/java/android/net/CaptivePortalTracker.java index 19ed65838a91a..ce71e6b04c111 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 | diff --git a/core/res/res/drawable-hdpi/stat_notify_rssi_in_range.png b/core/res/res/drawable-hdpi/stat_notify_rssi_in_range.png new file mode 100644 index 0000000000000..74977e6aefffb Binary files /dev/null and b/core/res/res/drawable-hdpi/stat_notify_rssi_in_range.png differ diff --git a/core/res/res/drawable-mdpi/stat_notify_rssi_in_range.png b/core/res/res/drawable-mdpi/stat_notify_rssi_in_range.png new file mode 100644 index 0000000000000..62e4fe94a35c1 Binary files /dev/null and b/core/res/res/drawable-mdpi/stat_notify_rssi_in_range.png differ diff --git a/core/res/res/drawable-xhdpi/stat_notify_rssi_in_range.png b/core/res/res/drawable-xhdpi/stat_notify_rssi_in_range.png new file mode 100644 index 0000000000000..c0586d8bc21ee Binary files /dev/null and b/core/res/res/drawable-xhdpi/stat_notify_rssi_in_range.png differ diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index eb2b5a677eacc..cda13bda4471e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -948,6 +948,7 @@ +