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

Commit cd0978bc authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Move default app preferences to one screen"

parents 4fa99fe6 73a2496d

res/layout/app_preference_item.xml

+15 −4
Original line number Diff line number Diff line
@@ -24,18 +24,29 @@ 
        android:id="@+id/app_image"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:adjustViewBounds="true"

        android:padding="6dip"

    />

    <CheckedTextView

    <TextView

        android:id="@+id/app_label"

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minHeight="?android:attr/listPreferredItemHeight"

        android:textAppearance="?android:attr/textAppearanceLarge"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorAlertDialogListItem"

        android:gravity="center_vertical"

        android:paddingEnd="7dip"

        android:checkMark="?android:attr/listChoiceIndicatorSingle"

        android:ellipsize="marquee"

    />

    <TextView

        android:id="@+id/default_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:minHeight="?android:attr/listPreferredItemHeight"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:gravity="center_vertical"

        android:text="@string/default_app"

        android:visibility="gone"

        android:paddingEnd="7dip"

    />

</LinearLayout>

res/values/strings.xml

+6 −3
Original line number Diff line number Diff line
@@ -2658,7 +2658,7 @@ 
    <string name="manage_mobile_plan_title" translatable="true">Mobile plan</string>



    <!-- SMS Application [CHAR LIMIT=35]-->

    <string name="sms_application_title" translatable="true">Default SMS app</string>

    <string name="sms_application_title" translatable="true">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">%1$s</xliff:g> instead of <xliff:g id="current_app">%2$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>
@@ -3019,7 +3019,7 @@ 
    <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->

    <string name="show_background_processes">Show cached processes</string>

    <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->

    <string name="default_emergency_app">Default emergency app</string>

    <string name="default_emergency_app">Emergency app</string>

    <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->

    <string name="reset_app_preferences">Reset app preferences</string>

    <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
@@ -6407,9 +6407,12 @@ 
    <string name="default_apps_title">Default Apps</string>



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

    <string name="default_browser_title">Default Browser</string>

    <string name="default_browser_title">Browser app</string>



    <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->

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



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

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



</resources>

res/xml/advanced_apps.xml

+0 −5
Original line number Diff line number Diff line
@@ -40,9 +40,4 @@ 
                android:value="com.android.settings.Settings$DomainsURLsAppListActivity" />

    </PreferenceScreen>



    <com.android.settings.applications.DefaultEmergencyPreference

        android:key="default_emergency_app"

        android:title="@string/default_emergency_app"

        settings:keywords="@string/keywords_emergency_app" />



</PreferenceScreen>

res/xml/default_apps.xml

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

            />



    <com.android.settings.applications.DefaultEmergencyPreference

            android:key="default_emergency_app"

            android:title="@string/default_emergency_app"

            settings:keywords="@string/keywords_emergency_app"

            />



    <com.android.settings.applications.DefaultSmsPreference

            android:key="default_sms_app"

            android:title="@string/sms_application_title"

            settings:keywords="@string/keywords_more_default_sms_app"

            />



</PreferenceScreen>

res/xml/wireless_settings.xml

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ 
        android:persistent="false"

        android:disableDependentsState="true" />



    <com.android.settings.AppListPreference

        android:key="sms_application"

        android:title="@string/sms_application_title"

        settings:keywords="@string/keywords_more_default_sms_app"

        android:summary="%s"

        android:persistent="false" />



    <SwitchPreference

        android:key="toggle_nfc"

        android:title="@string/nfc_quick_toggle_title"