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

Commit d53859df authored by Fan Zhang's avatar Fan Zhang
Browse files

Set about phone subtext to device model string. 

Also remove useless custom preference

Fix: 36395109
Test: robotests
Change-Id: I07297e6ade6991a8262473c9f59c21d914300244
parent b3f13f9f

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -943,8 +943,6 @@ 
                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/xml/security_settings_password_sub.xml

+16 −17
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  ~ limitations under the License

  -->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/settings_label">



    <com.android.settings.TimeoutListPreference
@@ -30,10 +30,9 @@ 
        android:key="power_button_instantly_locks"

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



        <com.android.settings.SingleLineSummaryPreference

    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

        android:title="@string/owner_info_settings_title"

        android:summary="@string/owner_info_settings_summary" />





</PreferenceScreen>

res/xml/security_settings_pattern_sub.xml

+19 −20
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  ~ limitations under the License

  -->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/settings_label">



    <SwitchPreference
@@ -34,10 +34,9 @@ 
        android:key="power_button_instantly_locks"

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



        <com.android.settings.SingleLineSummaryPreference

    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

        android:title="@string/owner_info_settings_title"

        android:summary="@string/owner_info_settings_summary" />





</PreferenceScreen>

res/xml/security_settings_pin_sub.xml

+16 −17
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
  ~ limitations under the License

  -->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/settings_label">



    <com.android.settings.TimeoutListPreference
@@ -30,10 +30,9 @@ 
        android:key="power_button_instantly_locks"

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



        <com.android.settings.SingleLineSummaryPreference

    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

        android:title="@string/owner_info_settings_title"

        android:summary="@string/owner_info_settings_summary" />





</PreferenceScreen>

res/xml/security_settings_slide_sub.xml

+7 −7
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
  ~ limitations under the License

  -->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/settings_label">



        <com.android.settings.SingleLineSummaryPreference

    <com.android.settingslib.RestrictedPreference

        android:key="owner_info_settings"

        android:title="@string/owner_info_settings_title"

        android:summary="@string/owner_info_settings_summary" />