diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-18 09:50:08 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-06-04 17:01:22 -0700 |
| commit | d1ab82807aae63926b35f66080a1f7a75c00b95b (patch) | |
| tree | d9122259ef7c6a885efefaddda488352b9bfb86c /res/xml | |
| parent | 13b2f06d2e5a74a52bc00b21f91d720407f5a98d (diff) | |
| download | packages_apps_settings-d1ab82807aae63926b35f66080a1f7a75c00b95b.zip packages_apps_settings-d1ab82807aae63926b35f66080a1f7a75c00b95b.tar.gz packages_apps_settings-d1ab82807aae63926b35f66080a1f7a75c00b95b.tar.bz2 | |
Account types at toplevel of Settings
Reorganized Account settings to show account types at the top-level
of Settings. Only account types that have accounts added are visible
here. There is an Add account button to add a new account.
Master sync toggle has moved to Data Usage screen in the overflow menu.
It shows additional detail of the function of the auto-sync toggle when
it is toggled by the user.
Account type screen (ManageAccountsSettings) shows list of accounts of
that type and any available authenticator settings. It additionally
verifies any Intents can be resolved before showing the corresponding
entry. This screen now shows last synced time for each account.
You can now sync all accounts of a type by selecting Sync now in the
Account type screen.
Account Sync screen that shows the list of syncable items has minor
tweaks:
- "Last synced...", "Sync is OFF"
- Doesn't show the authenticator settings here anymore.
Bug: 6579937
Change-Id: I8139a4c992b525a3e1efc24d2d223c3f5caddc76
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/account_sync_settings.xml | 3 | ||||
| -rw-r--r-- | res/xml/manage_accounts_settings.xml | 2 | ||||
| -rw-r--r-- | res/xml/settings_headers.xml | 21 |
3 files changed, 13 insertions, 13 deletions
diff --git a/res/xml/account_sync_settings.xml b/res/xml/account_sync_settings.xml index ff49c9c..0ec46b7 100644 --- a/res/xml/account_sync_settings.xml +++ b/res/xml/account_sync_settings.xml @@ -16,7 +16,4 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <PreferenceCategory android:key="dataAndSynchronization" - android:title="@string/header_data_and_synchronization" /> - </PreferenceScreen> diff --git a/res/xml/manage_accounts_settings.xml b/res/xml/manage_accounts_settings.xml index 0ec46b7..810fa7a 100644 --- a/res/xml/manage_accounts_settings.xml +++ b/res/xml/manage_accounts_settings.xml @@ -15,5 +15,5 @@ --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - + <PreferenceCategory android:title="@string/account_settings" /> </PreferenceScreen> diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index d8fb636..2089bac 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -113,15 +113,6 @@ android:title="@string/user_settings_title" android:id="@+id/user_settings" /> - <!-- Data Sync. The settings activity will ensure this is resolved to an - activity on the system image, otherwise it will remove this - preference. --> - <header - android:fragment="com.android.settings.accounts.ManageAccountsSettings" - android:icon="@drawable/ic_settings_sync" - android:title="@string/sync_settings" - android:id="@+id/sync_settings" /> - <!-- Location --> <header android:fragment="com.android.settings.LocationSettings" @@ -150,6 +141,18 @@ android:title="@string/privacy_settings" android:id="@+id/privacy_settings" /> + <!-- ACCOUNTS section --> + <header + android:id="@+id/account_settings" + android:title="@string/account_settings" /> + + <header + android:id="@+id/account_add" + android:title="@string/add_account_label" + android:icon="@drawable/ic_menu_add"> + <intent + android:action="android.settings.ADD_ACCOUNT_SETTINGS"/> + </header> <!-- SYSTEM --> <header android:title="@string/header_category_system" /> |