| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <PreferenceScreen | 6 <PreferenceScreen |
| 7 xmlns:android="http://schemas.android.com/apk/res/android" | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
| 8 xmlns:app="http://schemas.android.com/apk/res-auto" | 8 xmlns:app="http://schemas.android.com/apk/res-auto" |
| 9 android:orderingFromXml="false"> | 9 android:orderingFromXml="false"> |
| 10 | 10 |
| 11 <PreferenceCategory | 11 <PreferenceCategory |
| 12 android:title="@string/account_management_title" | 12 android:title="@string/account_management_title" |
| 13 android:order="0" /> | 13 android:order="0" /> |
| 14 | 14 |
| 15 <!-- Google accounts will be inserted here, using order values starting at 1
00 --> | 15 <!-- Google accounts will be inserted here, using order values starting at 1
00 --> |
| 16 | 16 |
| 17 <org.chromium.chrome.browser.preferences.ChromeBasePreference | 17 <org.chromium.chrome.browser.preferences.ChromeBasePreference |
| 18 android:key="add_account" | 18 android:key="add_account" |
| 19 android:icon="@drawable/add_circle_blue" | 19 android:icon="@drawable/add_circle_blue" |
| 20 android:order="1000" /> | 20 android:order="1000" /> |
| 21 | 21 |
| 22 <Preference |
| 23 android:layout="@layout/divider_preference" |
| 24 android:order="1001" /> |
| 25 |
| 22 <PreferenceCategory | 26 <PreferenceCategory |
| 23 android:key="parental_settings" | 27 android:key="parental_settings" |
| 24 android:title="@string/account_management_parental_settings" | 28 android:title="@string/account_management_parental_settings" |
| 25 android:order="1001" /> | 29 android:order="1002" /> |
| 26 | 30 |
| 27 <org.chromium.chrome.browser.preferences.ChromeBasePreference | 31 <org.chromium.chrome.browser.preferences.ChromeBasePreference |
| 28 android:key="parent_accounts" | 32 android:key="parent_accounts" |
| 29 android:order="1002" /> | 33 android:order="1003" /> |
| 30 | 34 |
| 31 <Preference | 35 <Preference |
| 32 android:key="child_content" | 36 android:key="child_content" |
| 33 android:title="@string/account_management_child_content_title" | 37 android:title="@string/account_management_child_content_title" |
| 34 android:order="1003" /> | 38 android:order="1004" /> |
| 39 |
| 40 <Preference |
| 41 android:key="child_content_divider" |
| 42 android:layout="@layout/divider_preference" |
| 43 android:order="1005" /> |
| 35 | 44 |
| 36 <org.chromium.chrome.browser.preferences.SyncPreference | 45 <org.chromium.chrome.browser.preferences.SyncPreference |
| 37 android:key="sync_settings" | 46 android:key="sync_settings" |
| 38 android:title="@string/sign_in_sync" | 47 android:title="@string/sign_in_sync" |
| 39 android:order="1005"/> | 48 android:order="1006" /> |
| 49 |
| 50 <Preference |
| 51 android:layout="@layout/divider_preference" |
| 52 android:order="1007" /> |
| 40 | 53 |
| 41 <Preference | 54 <Preference |
| 42 android:key="google_activity_controls" | 55 android:key="google_activity_controls" |
| 43 android:icon="@drawable/googleg" | 56 android:icon="@drawable/googleg" |
| 44 android:title="@string/sign_in_google_activity_controls" | 57 android:title="@string/sign_in_google_activity_controls" |
| 45 android:summary="@string/sign_in_google_activity_controls_message" | 58 android:summary="@string/sign_in_google_activity_controls_message" |
| 46 android:order="1006" /> | 59 android:order="1008" /> |
| 60 |
| 61 <Preference |
| 62 android:layout="@layout/divider_preference" |
| 63 android:order="1009" /> |
| 47 | 64 |
| 48 <Preference | 65 <Preference |
| 49 android:key="sign_out" | 66 android:key="sign_out" |
| 50 android:title="@string/account_management_sign_out" | 67 android:title="@string/account_management_sign_out" |
| 51 android:order="1007"/> | 68 android:order="1010" /> |
| 69 |
| 70 <Preference |
| 71 android:key="sign_out_divider" |
| 72 android:layout="@layout/divider_preference" |
| 73 android:order="1011" /> |
| 52 | 74 |
| 53 </PreferenceScreen> | 75 </PreferenceScreen> |
| OLD | NEW |