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

Commit 6ab6ed4e authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge ""My Phone" -> "About Phone"" into pi-dev

parents 30da391f 1225469e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@
        </activity>

        <activity android:name=".Settings$MyDeviceInfoActivity"
                  android:label="@string/device_info_settings"
                  android:label="@string/about_settings"
                  android:icon="@drawable/ic_settings_about"
                  android:taskAffinity="com.android.settings"
                  android:parentActivityName="Settings">
+0 −6
Original line number Diff line number Diff line
@@ -9676,12 +9676,6 @@
         [DO NOT TRANSLATE] -->
    <string name="account_confirmation_class" translatable="false"></string>
    <!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
    <string name="my_device_info_title" product="default">My Phone</string>
    <!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
    <string name="my_device_info_title" product="tablet">My Tablet</string>
    <!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
    <string name="my_device_info_title" product="device">My Device</string>
    <!-- Title for preference showing the primary account on the device [CHAR LIMIT=60]-->
    <string name="my_device_info_account_preference_title">Account</string>
    <!-- Title for preference showing the name of the device. [CHAR LIMIT=60]-->
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:key="my_device_info_pref_screen"
    android:title="@string/my_device_info_title"
    android:title="@string/about_settings"
    settings:initialExpandedChildrenCount="7">

    <com.android.settings.applications.LayoutPreference