PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fan Zhang
2018-03-24 05:16:01 +00:00
committed by Android (Google) Code Review
parent 30da391fa0 1225469ee9
commit 6ab6ed4e7a
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -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">

6
res/values/strings.xml
View File

@@ -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]-->

2
res/xml/my_device_info.xml
View File

@@ -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