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

Commit 3720e0c4 authored by Fan Zhang's avatar Fan Zhang
Browse files

Update system setting page subtext 

- Move android version from about phone subtext to system update
- Updates strings for autofill, keyboard & input, factory reset, swipe
  for notification
- Add a new pref category for spell checker and personal dictionary
- Display "None" if any default app is not selected
- Display current keyboard type as language subtext

Bug: 36395109
Test: make RunSettingsRoboTests
Change-Id: Id6ca94ea31e55f1c1ec04e47dcf657a25c35c7fe
parent aaa042de

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -565,8 +565,6 @@ 
            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.system"/>

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/summary_empty"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.language.LanguageAndInputSettings"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -945,6 +943,8 @@ 
                android:value="com.android.settings.category.ia.system" />

            <meta-data android:name="com.android.settings.title"

                android:resource="@string/about_settings" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/summary_empty"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.DeviceInfoSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

res/values/strings.xml

+8 −8
Original line number Diff line number Diff line
@@ -2910,8 +2910,6 @@ 
    <string name="reset_network_complete_toast">Network settings have been reset</string>









    <!-- Master Clear -->









    <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->









    <string name="device_reset_title">Reset device</string>









    <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->









    <string name="master_clear_title">Factory data reset</string>









    <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->








@@ -3769,6 +3767,8 @@







    <string name="language_settings">Languages&#160;&amp; input</string>









    <!-- Title of Languages & input settings screen -->









    <string name="language_keyboard_settings_title">Languages&#160;&amp; input</string>









    <!-- Title of preference category that lists all settings about helping user input such as spell checker [CHAR LIMIT=60]-->









    <string name="input_assistance">Input assistance</string>









    <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->









    <string name="keyboard_settings_category">Keyboard &amp; input methods</string>









    <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->








@@ -3815,7 +3815,7 @@







    <string name="failed_to_open_app_settings_toast">Failed to open settings for <xliff:g id="spell_application_name">%1$s</xliff:g></string>

















    <!-- Title for the 'keyboard and input methods' preference category. [CHAR LIMIT=45] -->









    <string name="keyboard_and_input_methods_category">Keyboard and input methods</string>









    <string name="keyboard_and_input_methods_category">Keyboard &amp; inputs</string>









    <!-- Title for the 'virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->









    <string name="virtual_keyboard_category">Virtual keyboards</string>









    <!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->








@@ -7536,7 +7536,7 @@







    <string name="backup_disabled">Back up disabled</string>

















    <!-- Summary of device info page [CHAR LIMIT=NONE] -->









    <string name="about_summary">Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>









    <string name="about_summary">Updated to Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>

















    <!-- Title for dialog displayed when user clicks on a setting locked by an admin [CHAR LIMIT=30] -->









    <string name="disabled_by_policy_title">Action not allowed</string>








@@ -8119,8 +8119,8 @@







    <!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->









    <string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device.</string>

















    <!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->









    <string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>









    <!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=80]-->









    <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>

















    <!-- Summary text for fingerprint swipe for notifications (phone) [CHAR LIMIT=160]-->









    <string name="fingerprint_swipe_for_notifications_summary" product="default">To check your notifications, swipe down on the fingerprint sensor on the back of your phone.</string>








@@ -8318,8 +8318,8 @@







    <string name="webview_disabled_for_user">(disabled for user <xliff:g id="user" example="John Doe">%s</xliff:g>)</string>

















    <!-- AutoFill strings -->









    <!-- Preference label for the auto-fill app. [CHAR LIMIT=60] -->









    <string name="autofill_app">Autofill app</string>









    <!-- Preference label for choosing auto-fill service. [CHAR LIMIT=60] -->









    <string name="autofill_app">Autofill service</string>









    <!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->









    <string name="autofill_keywords">auto, fill, autofill</string>









    <!-- Title of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->

























res/xml/language_and_input.xml



+15
−12






























Original line number
Diff line number
Diff line







@@ -34,6 +34,8 @@







            android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"/>









    </PreferenceCategory>



















    <PreferenceCategory









        android:title="@string/input_assistance">









        <!-- Spell checker preference title, summary and fragment will be set programmatically. -->









        <!-- Note: Mark this as persistent="false" to remove unnecessarily saved shared preference.









             See: InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference. -->








@@ -47,6 +49,7 @@







        <Preference









            android:key="key_user_dictionary_settings"









            android:title="@string/user_dict_settings_title"/>









    </PreferenceCategory>



















    <PreferenceCategory









        android:key="gesture_settings_category"
































res/xml/system_dashboard_fragment.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -23,7 +23,7 @@







    <Preference









        android:key="system_update_settings"









        android:title="@string/system_update_settings_list_item_title"









        android:summary="@string/system_update_settings_list_item_summary"









        android:summary="@string/summary_placeholder"









        android:icon="@drawable/ic_system_update"









        android:order="-30">









        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>








@@ -41,7 +41,7 @@







    <!-- Factory reset -->









    <com.android.settingslib.RestrictedPreference









        android:key="factory_reset"









        android:title="@string/device_reset_title"









        android:title="@string/master_clear_title"









        android:icon="@drawable/ic_restore"









        android:order="-20"









        settings:keywords="@string/keywords_factory_data_reset"
































src/com/android/settings/DeviceInfoSettings.java



+0
−30






























Original line number
Diff line number
Diff line







@@ -20,14 +20,12 @@ import android.app.Activity;







import android.app.Fragment;









import android.content.Context;









import android.content.Intent;









import android.os.Build;









import android.provider.SearchIndexableResource;



















import com.android.internal.logging.nano.MetricsProto.MetricsEvent;









import com.android.settings.core.PreferenceController;









import com.android.settings.core.lifecycle.Lifecycle;









import com.android.settings.dashboard.DashboardFragment;









import com.android.settings.dashboard.SummaryLoader;









import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;









import com.android.settings.deviceinfo.BasebandVersionPreferenceController;









import com.android.settings.deviceinfo.BuildNumberPreferenceController;








@@ -88,34 +86,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {







                getLifecycle());









    }



















    private static class SummaryProvider implements SummaryLoader.SummaryProvider {



















        private final Context mContext;









        private final SummaryLoader mSummaryLoader;



















        public SummaryProvider(Context context, SummaryLoader summaryLoader) {









            mContext = context;









            mSummaryLoader = summaryLoader;









        }



















        @Override









        public void setListening(boolean listening) {









            if (listening) {









                mSummaryLoader.setSummary(this, mContext.getString(R.string.about_summary,









                        Build.VERSION.RELEASE));









            }









        }









    }



















    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY









            = new SummaryLoader.SummaryProviderFactory() {









        @Override









        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,









                SummaryLoader summaryLoader) {









            return new SummaryProvider(activity, summaryLoader);









        }









    };



















    private static List<PreferenceController> buildPreferenceControllers(Context context,









            Activity activity, Fragment fragment, Lifecycle lifecycle) {









        final List<PreferenceController> controllers = new ArrayList<>();