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

8
res/values/strings.xml
View File

@@ -4224,7 +4224,7 @@
<!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type --> <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
<string name="process_stats_type_cached">Cached</string> <string name="process_stats_type_cached">Cached</string>
<!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over --> <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
<string name="process_stats_memory_status">Memory is <string name="process_stats_memory_status">Memory is
<xliff:g id="memstate">%1$s</xliff:g></string> <xliff:g id="memstate">%1$s</xliff:g></string>
<!-- [CHAR LIMIT=NONE] Label OS "process" app --> <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
<string name="process_stats_os_label">Android OS</string> <string name="process_stats_os_label">Android OS</string>
@@ -5856,7 +5856,7 @@
<string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string> <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>
<string name="keywords_reset_apps">reset preferences default</string> <string name="keywords_reset_apps">reset preferences default</string>
<string name="keywords_emergency_app">emergency ice app default</string> <string name="keywords_emergency_app">emergency ice app default</string>
<string name="keywords_default_dialer_app">dialer default</string> <string name="keywords_default_phone_app">phone dialer default</string>
<string name="keywords_all_apps">apps download applications system</string> <string name="keywords_all_apps">apps download applications system</string>
<string name="keywords_app_permissions">apps permissions security</string> <string name="keywords_app_permissions">apps permissions security</string>
<string name="keywords_default_apps">apps default</string> <string name="keywords_default_apps">apps default</string>
@@ -6585,8 +6585,8 @@
<!-- Summary for No Default Browser settings [CHAR LIMIT=45] --> <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
<string name="default_browser_title_none">No default Browser</string> <string name="default_browser_title_none">No default Browser</string>
<!-- Title for Default Dialer settings [CHAR LIMIT=30] --> <!-- Title for Default Phone app settings [CHAR LIMIT=30] -->
<string name="default_dialer_title">Dialer app</string> <string name="default_phone_title">Phone app</string>
<!-- Label of default app for current setting [CHAR LIMIT=40] --> <!-- Label of default app for current setting [CHAR LIMIT=40] -->
<string name="default_app">(Default)</string> <string name="default_app">(Default)</string>

8
res/xml/default_apps.xml
View File

@@ -25,10 +25,10 @@
android:summary="@string/default_browser_title_none" android:summary="@string/default_browser_title_none"
/> />
<com.android.settings.applications.DefaultDialerPreference <com.android.settings.applications.DefaultPhonePreference
android:key="default_dialer" android:key="default_phone_app"
android:title="@string/default_dialer_title" android:title="@string/default_phone_title"
settings:keywords="@string/keywords_default_dialer_app" settings:keywords="@string/keywords_default_phone_app"
/> />
<com.android.settings.applications.DefaultEmergencyPreference <com.android.settings.applications.DefaultEmergencyPreference

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.List;
import java.util.Objects; 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); super(context, attrs);
if (isAvailable(context)) { 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 TAG = ManageDefaultApps.class.getSimpleName();
private static final String KEY_DEFAULT_BROWSER = "default_browser"; 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_DEFAULT_EMERGENCY_APP = "default_emergency_app";
private static final String KEY_SMS_APPLICATION = "default_sms_app"; private static final String KEY_SMS_APPLICATION = "default_sms_app";
@@ -97,8 +97,8 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
removePreference(KEY_SMS_APPLICATION); removePreference(KEY_SMS_APPLICATION);
} }
if (!DefaultDialerPreference.isAvailable(getActivity())) { if (!DefaultPhonePreference.isAvailable(getActivity())) {
removePreference(KEY_DEFAULT_DIALER); removePreference(KEY_DEFAULT_PHONE_APP);
} }
if (!DefaultEmergencyPreference.isAvailable(getActivity())) { if (!DefaultEmergencyPreference.isAvailable(getActivity())) {