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

Merge "Rename default dialer to default phone app" into mnc-dev

Browse Source
This commit is contained in:
Yorke Lee
2015-05-05 00:22:12 +00:00
committed by Android (Google) Code Review
parent 0ab13b8326 628a98c1df
commit 3066f83243
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/DefaultDialerPreference.java → src/com/android/settings/applications/DefaultPhonePreference.java
View File

@@ -28,9 +28,9 @@ import com.android.settings.AppListPreference;
import java.util.List;
import java.util.Objects;
public class DefaultDialerPreference extends AppListPreference {
public class DefaultPhonePreference extends AppListPreference {
public DefaultDialerPreference(Context context, AttributeSet attrs) {
public DefaultPhonePreference(Context context, AttributeSet attrs) {
super(context, attrs);
if (isAvailable(context)) {

6
src/com/android/settings/applications/ManageDefaultApps.java
View File

@@ -49,7 +49,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
private static final String TAG = ManageDefaultApps.class.getSimpleName();
private static final String KEY_DEFAULT_BROWSER = "default_browser";
private static final String KEY_DEFAULT_DIALER = "default_dialer";
private static final String KEY_DEFAULT_PHONE_APP = "default_phone_app";
private static final String KEY_DEFAULT_EMERGENCY_APP = "default_emergency_app";
private static final String KEY_SMS_APPLICATION = "default_sms_app";
@@ -97,8 +97,8 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
removePreference(KEY_SMS_APPLICATION);
}
if (!DefaultDialerPreference.isAvailable(getActivity())) {
removePreference(KEY_DEFAULT_DIALER);
if (!DefaultPhonePreference.isAvailable(getActivity())) {
removePreference(KEY_DEFAULT_PHONE_APP);
}
if (!DefaultEmergencyPreference.isAvailable(getActivity())) {