Move ManageAccountsSettings into Settings.
- Add activity-alias for the Activity. - Copy the Activity from AccountsAndSyncSettings. - Fragmentize ManageAccountsSettings. - Remove dependency toward AccountPreferenceBase, which is used in AccountsAndSyncSettings widely. - Add missing implementation derived from AccountPrefernceBase. - Copy dependent drawables. - Copy dependent xmls - Copy AccountPrefernce.java. - Copy strings, adding CHAR LIMIT. - Remove the logic which remove the preference when its destination Activity is missing. We already have the destination as Fragment, and it never disappear. Change-Id: Id41c63d7064aebeaae31bcd84bf4fd20a5636dfe
BIN
res/drawable-hdpi/ic_list_sync_anim0.png
Executable file
After Width: | Height: | Size: 2.8 KiB |
BIN
res/drawable-hdpi/ic_list_sync_anim1.png
Executable file
After Width: | Height: | Size: 2.9 KiB |
BIN
res/drawable-hdpi/ic_list_sync_anim2.png
Executable file
After Width: | Height: | Size: 2.8 KiB |
BIN
res/drawable-hdpi/ic_list_sync_anim3.png
Executable file
After Width: | Height: | Size: 3.0 KiB |
BIN
res/drawable-hdpi/ic_sync_green.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
res/drawable-hdpi/ic_sync_grey.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
res/drawable-hdpi/ic_sync_red.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
res/drawable-mdpi/ic_list_sync_anim0.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
res/drawable-mdpi/ic_list_sync_anim1.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
res/drawable-mdpi/ic_list_sync_anim2.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
BIN
res/drawable-mdpi/ic_list_sync_anim3.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
res/drawable-mdpi/ic_list_syncerror.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
res/drawable-mdpi/ic_sync_green.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
res/drawable-mdpi/ic_sync_grey.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-mdpi/ic_sync_red.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
28
res/drawable/ic_list_sync_anim.xml
Normal file
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/* //device/apps/common/res/drawable/status_icon_background.xml
|
||||
**
|
||||
** Copyright 2007, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
-->
|
||||
<animation-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:oneshot="false">
|
||||
<item android:drawable="@drawable/ic_list_sync_anim0" android:duration="150" />
|
||||
<item android:drawable="@drawable/ic_list_sync_anim1" android:duration="150" />
|
||||
<item android:drawable="@drawable/ic_list_sync_anim2" android:duration="150" />
|
||||
<item android:drawable="@drawable/ic_list_sync_anim3" android:duration="150" />
|
||||
</animation-list>
|
||||
|
64
res/layout/account_preference.xml
Normal file
@@ -0,0 +1,64 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2009 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="16dip"
|
||||
android:paddingRight="?android:attr/scrollbarSize">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/providerIcon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_gravity="center" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="6dip"
|
||||
android:layout_marginTop="6dip"
|
||||
android:layout_marginBottom="6dip"
|
||||
android:layout_weight="1">
|
||||
|
||||
<TextView android:id="@+android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||
|
||||
<TextView android:id="@+android:id/summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@android:id/title"
|
||||
android:layout_alignLeft="@android:id/title"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:maxLines="2" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/syncStatusIcon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="7dip"
|
||||
android:layout_gravity="center" />
|
||||
|
||||
</LinearLayout>
|
63
res/layout/manage_accounts_screen.xml
Normal file
@@ -0,0 +1,63 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/* //device/apps/common/assets/res/layout/list_content.xml
|
||||
**
|
||||
** Copyright 2006, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:drawSelectorOnTop="false"
|
||||
android:scrollbarAlwaysDrawVerticalTrack="true"
|
||||
/>
|
||||
|
||||
<TextView android:id="@+id/sync_settings_error_info"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sync_is_failing" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:background="@android:drawable/bottom_bar">
|
||||
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<Button android:id="@+id/add_account_button"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:layout_marginTop="5dip"
|
||||
android:text="@string/add_account_label" />
|
||||
|
||||
<View
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
@@ -2700,4 +2700,38 @@ found in the list of installed applications.</string>
|
||||
|
||||
<!-- Do not translate. This is a stub which will be removed soon. -->
|
||||
<string name="time_zone_auto_stub" translatable="false">Select Time Zone</string>
|
||||
|
||||
|
||||
|
||||
<!-- Message when sync is currently failing [CHAR LIMIT=100] -->
|
||||
<string name="sync_is_failing">Sync is currently experiencing problems. It will be back shortly.</string>
|
||||
<!-- Button label to add an account [CHAR LIMIT=20] -->
|
||||
<string name="add_account_label">Add account</string>
|
||||
<!-- Header title for those settings relating to general syncing.
|
||||
[CHAR LIMIT=30] -->
|
||||
<string name="header_general_sync_settings">General sync settings</string>
|
||||
<!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
|
||||
<string name="background_data">Background data</string>
|
||||
<!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
|
||||
<string name="background_data_summary">Applications can sync, send, and receive data at any time</string>
|
||||
<!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
|
||||
<string name="background_data_dialog_title">Attention</string>
|
||||
<!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
|
||||
<string name="background_data_dialog_message">Disabling background data extends battery life and lowers data use. Some applications may still use the background data connection.</string>
|
||||
<!-- Data synchronization settings screen, setting option name
|
||||
[CHAR LIMIT=30] -->
|
||||
<string name="sync_automatically">Auto-sync</string>
|
||||
<!-- Data synchronization settings screen, setting option summary text when check box is selected [CHAR LIMIT=60] -->
|
||||
<string name="sync_automatically_summary">Applications sync data automatically</string>
|
||||
<!-- Header title for list of accounts on Accounts & Synchronization settings [CHAR LIMIT=30] -->
|
||||
<string name="header_manage_accounts">Manage accounts</string>
|
||||
|
||||
<!-- Sync status messages on Accounts & Synchronization settings --><skip/>
|
||||
<!-- Sync status shown when sync is enabled [CHAR LIMIT=20] -->
|
||||
<string name="sync_enabled">Sync is ON</string>
|
||||
<!-- Sync status shown when sync is disabled [CHAR LIMIT=20] -->
|
||||
<string name="sync_disabled">Sync is OFF</string>
|
||||
<!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=20] -->
|
||||
<string name="sync_error">Sync error</string>
|
||||
|
||||
</resources>
|
||||
|
36
res/xml/manage_accounts_settings.xml
Normal file
@@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2008 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="@string/header_general_sync_settings" />
|
||||
|
||||
<CheckBoxPreference android:key="backgroundDataCheckBox"
|
||||
android:persistent="false"
|
||||
android:title="@string/background_data"
|
||||
android:summary="@string/background_data_summary"/>
|
||||
|
||||
<CheckBoxPreference android:key="syncAutomaticallyCheckBox"
|
||||
android:persistent="false"
|
||||
android:dependency="backgroundDataCheckBox"
|
||||
android:title="@string/sync_automatically"
|
||||
android:summary="@string/sync_automatically_summary"/>
|
||||
|
||||
<PreferenceCategory android:key="manageAccountsCategory"
|
||||
android:title="@string/header_manage_accounts" />
|
||||
|
||||
</PreferenceScreen>
|
@@ -93,10 +93,10 @@
|
||||
preference. -->
|
||||
|
||||
<com.android.settings.IconPreferenceScreen
|
||||
android:fragment="com.android.settings.ManageAccountsSettings"
|
||||
settings:icon="@drawable/ic_settings_sync"
|
||||
android:title="@string/sync_settings"
|
||||
android:key="sync_settings">
|
||||
<intent android:action="android.settings.SYNC_SETTINGS" />
|
||||
</com.android.settings.IconPreferenceScreen>
|
||||
|
||||
<!-- Privacy -->
|
||||
|