commit 881d5796204262f045d1f30596b824505ad8c0b5
author Fan Zhang <zhfan@google.com> Fri Jan 26 10:15:56 2018 -0800
committer Fan Zhang <zhfan@google.com> Fri Jan 26 12:39:34 2018 -0800
tree 5ba2da440a281eb4a36a3a33d03e970a36c52f72
parent c24930aaf21b2a05e872df6a13fdba48cab61893

Misc fixes for User page and my device info page

- Rename UserAndAccountDashboard* to AccountDashboard*
- Move emergency info from account to device info page

- Move auto sync data toggles (4 of them) from Account page to user page
   - Move the controllers too. UserSettings is a not a DashboardFragment
     so I had to manually call each controller method.
     TODO: refactor UserSettings to a DashboardFragment

- Move legal information/regulatory info above advance button within device info page.

Fixes: 72523158
Bug: 71871075
Test: robotests
Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4a4275f..1963830 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1006,7 +1006,7 @@
         </activity>
 
 
-        <activity android:name="Settings$MeCardActivity"
+        <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/device_info_settings"
                   android:icon="@drawable/ic_settings_about"
                   android:taskAffinity="com.android.settings"
@@ -1020,7 +1020,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-            <intent-filter android:priority="10">
+            <intent-filter android:priority="270">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
@@ -2329,7 +2329,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account"
             android:taskAffinity="com.android.settings"
-            android:parentActivityName="Settings$UserAndAccountDashboardActivity">
+            android:parentActivityName=".Settings$AccountDashboardActivity">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -3092,7 +3092,7 @@
                        android:resource="@string/app_and_notification_dashboard_summary"/>
         </activity>
 
-        <activity android:name=".Settings$UserAndAccountDashboardActivity"
+        <activity android:name=".Settings$AccountDashboardActivity"
                   android:label="@string/account_dashboard_title"
                   android:icon="@drawable/ic_homepage_accounts">
             <intent-filter android:priority="3">
@@ -3103,11 +3103,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
+                       android:value="com.android.settings.accounts.AccountDashboardFragment"/>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-              android:value="true" />
         </activity>
 
         <activity android:name=".Settings$SystemDashboardActivity"