Created Multi-SIM notifications.
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is added, removed, or replaced. + The notification informs the user there has been a change in SIMs and they can tap the notification to go SIM Card Settings. Bug: 18293625 Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
This commit is contained in:
@@ -66,6 +66,7 @@
|
|||||||
<uses-permission android:name="android.permission.SET_TIME" />
|
<uses-permission android:name="android.permission.SET_TIME" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
|
<uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
|
||||||
<uses-permission android:name="android.permission.REBOOT" />
|
<uses-permission android:name="android.permission.REBOOT" />
|
||||||
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
|
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
|
||||||
<uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
|
<uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
|
||||||
<uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
|
<uses-permission android:name="android.permission.OEM_UNLOCK_STATE" />
|
||||||
@@ -1988,6 +1989,12 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
|
<receiver android:name=".sim.SimBootReceiver">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
|
||||||
|
</intent-filter>
|
||||||
|
</receiver>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="android.support.v4.content.FileProvider"
|
android:name="android.support.v4.content.FileProvider"
|
||||||
android:authorities="com.android.settings.files"
|
android:authorities="com.android.settings.files"
|
||||||
|
BIN
res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
Normal file
BIN
res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 412 B |
BIN
res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
Normal file
BIN
res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 321 B |
BIN
res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
Normal file
BIN
res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 516 B |
BIN
res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
Normal file
BIN
res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 718 B |
BIN
res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
Normal file
BIN
res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 931 B |
@@ -72,4 +72,6 @@
|
|||||||
<color name="switch_accent_color">#ff7fcac3</color>
|
<color name="switch_accent_color">#ff7fcac3</color>
|
||||||
|
|
||||||
<color name="wifi_divider">#ffe0e0e0</color>
|
<color name="wifi_divider">#ffe0e0e0</color>
|
||||||
|
<color name="sim_noitification">@*android:color/material_deep_teal_500</color>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -5548,6 +5548,10 @@
|
|||||||
<string name="preferred_network_offload_popup">Disabling Network Name Broadcast will prevent automatic connection to hidden networks.</string>
|
<string name="preferred_network_offload_popup">Disabling Network Name Broadcast will prevent automatic connection to hidden networks.</string>
|
||||||
<!-- Summary text describing signal strength to the user. [CHAR LIMIT=60] -->
|
<!-- Summary text describing signal strength to the user. [CHAR LIMIT=60] -->
|
||||||
<string name="sim_signal_strength"><xliff:g id="dbm">%1$d</xliff:g> dBm <xliff:g id="asu">%2$d</xliff:g> asu</string>
|
<string name="sim_signal_strength"><xliff:g id="dbm">%1$d</xliff:g> dBm <xliff:g id="asu">%2$d</xliff:g> asu</string>
|
||||||
|
<!-- Title for SIM card notification. [CHAR LIMIT=40] -->
|
||||||
|
<string name="sim_notification_title">SIM cards changed.</string>
|
||||||
|
<!-- Message under title informing the user to touch to go to SIM Cards in Settings. [CHAR LIMIT=40] -->
|
||||||
|
<string name="sim_notification_summary">Touch to set up</string>
|
||||||
|
|
||||||
<!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
|
<!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
|
||||||
<string name="sim_pref_divider">Preferred SIM for</string>
|
<string name="sim_pref_divider">Preferred SIM for</string>
|
||||||
|
142
src/com/android/settings/sim/SimBootReceiver.java
Normal file
142
src/com/android/settings/sim/SimBootReceiver.java
Normal file
@@ -0,0 +1,142 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.sim;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.Settings.SimSettingsActivity;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.app.PendingIntent;
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.content.SharedPreferences.Editor;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.support.v4.app.NotificationCompat;
|
||||||
|
import android.telephony.SubscriptionInfo;
|
||||||
|
import android.telephony.SubscriptionListener;
|
||||||
|
import android.telephony.SubscriptionManager;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.android.settings.Utils;
|
||||||
|
|
||||||
|
public class SimBootReceiver extends BroadcastReceiver {
|
||||||
|
private static final int SLOT_EMPTY = -1;
|
||||||
|
private static final int NOTIFICATION_ID = 1;
|
||||||
|
private static final String SHARED_PREFERENCES_NAME = "sim_state";
|
||||||
|
private static final String SLOT_PREFIX = "sim_slot_";
|
||||||
|
|
||||||
|
private SharedPreferences mSharedPreferences = null;
|
||||||
|
private TelephonyManager mTelephonyManager;
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onReceive(Context context, Intent intent) {
|
||||||
|
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||||
|
mContext = context;
|
||||||
|
mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME,
|
||||||
|
Context.MODE_PRIVATE);
|
||||||
|
|
||||||
|
SubscriptionManager.register(mContext, mSubscriptionListener,
|
||||||
|
SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void detectChangeAndNotify() {
|
||||||
|
final int numSlots = mTelephonyManager.getSimCount();
|
||||||
|
|
||||||
|
// Do not create notifications on single SIM devices.
|
||||||
|
if (numSlots < 2) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We wait until SubscriptionManager returns a valid list of Subscription informations
|
||||||
|
// by checking if the list is empty.
|
||||||
|
// This is not completely correct, but works for most cases.
|
||||||
|
// See Bug: 18377252
|
||||||
|
if (SubscriptionManager.getActiveSubscriptionInfoList().size() < 1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < numSlots; i++) {
|
||||||
|
final SubscriptionInfo sir = Utils.findRecordBySlotId(i);
|
||||||
|
final String key = SLOT_PREFIX+i;
|
||||||
|
final int lastSubId = getLastSubId(key);
|
||||||
|
|
||||||
|
if (sir != null) {
|
||||||
|
final int currentSubId = sir.getSubscriptionId();
|
||||||
|
if (lastSubId != currentSubId) {
|
||||||
|
createNotification(mContext);
|
||||||
|
setLastSubId(key, currentSubId);
|
||||||
|
}
|
||||||
|
} else if (lastSubId != SLOT_EMPTY) {
|
||||||
|
createNotification(mContext);
|
||||||
|
setLastSubId(key, SLOT_EMPTY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getLastSubId(String strSlotId) {
|
||||||
|
return mSharedPreferences.getInt(strSlotId, SLOT_EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setLastSubId(String strSlotId, int value) {
|
||||||
|
Editor editor = mSharedPreferences.edit();
|
||||||
|
editor.putInt(strSlotId, value);
|
||||||
|
editor.commit();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void createNotification(Context context){
|
||||||
|
final Resources resources = context.getResources();
|
||||||
|
|
||||||
|
NotificationCompat.Builder builder =
|
||||||
|
new NotificationCompat.Builder(context)
|
||||||
|
.setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
|
||||||
|
.setColor(resources.getColor(R.color.sim_noitification))
|
||||||
|
.setContentTitle(resources.getString(R.string.sim_notification_title))
|
||||||
|
.setContentText(resources.getString(R.string.sim_notification_summary));
|
||||||
|
Intent resultIntent = new Intent(context, SimSettingsActivity.class);
|
||||||
|
resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
PendingIntent resultPendingIntent =
|
||||||
|
PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
0,
|
||||||
|
resultIntent,
|
||||||
|
PendingIntent.FLAG_CANCEL_CURRENT
|
||||||
|
);
|
||||||
|
builder.setContentIntent(resultPendingIntent);
|
||||||
|
NotificationManager notificationManager =
|
||||||
|
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
|
||||||
|
notificationManager.notify(NOTIFICATION_ID, builder.build());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void cancelNotification(Context context) {
|
||||||
|
NotificationManager notificationManager =
|
||||||
|
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
|
||||||
|
notificationManager.cancel(NOTIFICATION_ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {
|
||||||
|
@Override
|
||||||
|
public void onSubscriptionInfoChanged() {
|
||||||
|
detectChangeAndNotify();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
@@ -131,6 +131,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
|
|||||||
|
|
||||||
createPreferences();
|
createPreferences();
|
||||||
updateAllOptions();
|
updateAllOptions();
|
||||||
|
|
||||||
|
SimBootReceiver.cancelNotification(getActivity());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createPreferences() {
|
private void createPreferences() {
|
||||||
@@ -583,5 +585,4 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user