PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1c17255d: Block "SMS Default Dialog" on non-phone devices

Browse Source 
* commit '1c17255d5edadaf1790af365d2ed5f962a7bcc65':
  Block "SMS Default Dialog" on non-phone devices
This commit is contained in:
David Braun
2013-10-07 11:13:22 -07:00
committed by Android Git Automerger
parent 040cfe5611 1c17255d5e
commit a633e1d54d
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -2386,7 +2386,8 @@
<!-- SMS Application [CHAR LIMIT=35]--> <!-- SMS Application [CHAR LIMIT=35]-->
<string name="sms_application_title" translatable="true">Default SMS app</string> <string name="sms_application_title" translatable="true">Default SMS app</string>
<string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string> <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
<string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS application?</string> <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS app?</string>
<string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
<!-- The SIM operator is not known [CHAR_ LIMIT=50]--> <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
<string name="mobile_unknown_sim_operator" translatable="true">Uknown SIM operator</string> <string name="mobile_unknown_sim_operator" translatable="true">Uknown SIM operator</string>

28
src/com/android/settings/SmsDefaultDialog.java
View File

@@ -24,6 +24,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Telephony.Sms.Intents; import android.provider.Telephony.Sms.Intents;
import android.telephony.TelephonyManager;
import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController; import com.android.internal.app.AlertController;
@@ -62,23 +63,38 @@ public final class SmsDefaultDialog extends AlertActivity implements
} }
private boolean buildDialog(String packageName) { private boolean buildDialog(String packageName) {
TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE) {
// No phone, no SMS
return false;
}
mNewSmsApplicationData = SmsApplication.getSmsApplicationData(packageName, this); mNewSmsApplicationData = SmsApplication.getSmsApplicationData(packageName, this);
if (mNewSmsApplicationData == null) { if (mNewSmsApplicationData == null) {
return false; return false;
} }
SmsApplicationData oldSmsApplicationData = null;
ComponentName oldSmsComponent = SmsApplication.getDefaultSmsApplication(this, true); ComponentName oldSmsComponent = SmsApplication.getDefaultSmsApplication(this, true);
SmsApplicationData oldSmsApplicationData = if (oldSmsComponent != null) {
SmsApplication.getSmsApplicationData(oldSmsComponent.getPackageName(), this); oldSmsApplicationData =
if (oldSmsApplicationData.mPackageName.equals(mNewSmsApplicationData.mPackageName)) { SmsApplication.getSmsApplicationData(oldSmsComponent.getPackageName(), this);
return false; if (oldSmsApplicationData.mPackageName.equals(mNewSmsApplicationData.mPackageName)) {
return false;
}
} }
// Compose dialog; get // Compose dialog; get
final AlertController.AlertParams p = mAlertParams; final AlertController.AlertParams p = mAlertParams;
p.mTitle = getString(R.string.sms_change_default_dialog_title); p.mTitle = getString(R.string.sms_change_default_dialog_title);
p.mMessage = getString(R.string.sms_change_default_dialog_text, if (oldSmsApplicationData != null) {
mNewSmsApplicationData.mApplicationName, oldSmsApplicationData.mApplicationName); p.mMessage = getString(R.string.sms_change_default_dialog_text,
mNewSmsApplicationData.mApplicationName,
oldSmsApplicationData.mApplicationName);
} else {
p.mMessage = getString(R.string.sms_change_default_no_previous_dialog_text,
mNewSmsApplicationData.mApplicationName);
}
p.mPositiveButtonText = getString(R.string.yes); p.mPositiveButtonText = getString(R.string.yes);
p.mNegativeButtonText = getString(R.string.no); p.mNegativeButtonText = getString(R.string.no);
p.mPositiveButtonListener = this; p.mPositiveButtonListener = this;