Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3066f832 authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

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

parents 0ab13b83 628a98c1

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -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_reset_apps">reset preferences 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_app_permissions">apps permissions security</string>

    <string name="keywords_default_apps">apps default</string>
@@ -6585,8 +6585,8 @@ 
    <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->

    <string name="default_browser_title_none">No default Browser</string>



    <!--  Title for Default Dialer settings [CHAR LIMIT=30] -->

    <string name="default_dialer_title">Dialer app</string>

    <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->

    <string name="default_phone_title">Phone app</string>



    <!-- Label of default app for current setting [CHAR LIMIT=40] -->

    <string name="default_app">(Default)</string>

res/xml/default_apps.xml

+4 −4
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
            android:summary="@string/default_browser_title_none"

            />



    <com.android.settings.applications.DefaultDialerPreference

            android:key="default_dialer"

            android:title="@string/default_dialer_title"

            settings:keywords="@string/keywords_default_dialer_app"

    <com.android.settings.applications.DefaultPhonePreference

            android:key="default_phone_app"

            android:title="@string/default_phone_title"

            settings:keywords="@string/keywords_default_phone_app"

            />



    <com.android.settings.applications.DefaultEmergencyPreference

src/com/android/settings/applications/DefaultDialerPreference.java→src/com/android/settings/applications/DefaultPhonePreference.java

+2 −2
Original line number Diff line number Diff line
@@ -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)) {

src/com/android/settings/applications/ManageDefaultApps.java

+3 −3
Original line number Diff line number Diff line
@@ -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())) {