From 1225469ee9402dd29080f56ae598e9ed09a5d68f Mon Sep 17 00:00:00 2001
From: Daniel Nishi <dhnishi@google.com>
Date: Fri, 23 Mar 2018 13:43:12 -0700
Subject: [PATCH] "My Phone" -> "About Phone"

String polishing fix.

Bug: 36458278
Test: Manual
Change-Id: If0d90aa252d0ffe8bdbb8d255d1bec736ba2017a
---
 AndroidManifest.xml        | 2 +-
 res/values/strings.xml     | 6 ------
 res/xml/my_device_info.xml | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e2accdd2443..3fd5865932f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -983,7 +983,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">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f844f41c870..46213174a39 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9542,12 +9542,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]-->
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 8c93f97098d..619bd669f1c 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -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