Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d839875 authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Revert "Revert "Move global sync settings to AccountSettings."" 

This reverts commit 4869faf4.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
parent 59ea80b7

AndroidManifest.xml

+11 −11
Original line number Diff line number Diff line
@@ -1485,26 +1485,26 @@ 
                android:resource="@id/battery_settings" />

        </activity>



        <activity android:name="Settings$AccountSyncSettingsActivity"

            android:label="@string/account_sync_settings_title"

        <activity android:name="Settings$AccountSettingsActivity"

            android:label="@string/account_settings_title"

            android:taskAffinity=""

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />

                <action android:name="android.settings.SYNC_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.accounts.AccountSyncSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/account_settings" />

                android:value="com.android.settings.accounts.AccountSettings" />

        </activity>



        <activity android:name=".accounts.SyncSettingsActivity"

            android:label="@string/account_sync_settings_title">

        <activity android:name="Settings$AccountSyncSettingsActivity"

            android:label="@string/account_sync_settings_title"

            android:taskAffinity=""

            android:parentActivityName="Settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.SYNC_SETTINGS" />

                <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

res/menu/account_settings.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/account_settings_menu_auto_sync"

        android:title="@string/account_settings_menu_auto_sync"

        android:checkable="true" />

    <item

        android:id="@+id/account_settings_menu_auto_sync_personal"

        android:title="@string/account_settings_menu_auto_sync_personal"

        android:checkable="true" />

    <item

        android:id="@+id/account_settings_menu_auto_sync_work"

        android:title="@string/account_settings_menu_auto_sync_work"

        android:checkable="true" />

</menu>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -4798,6 +4798,12 @@ 
    <string name="data_usage_menu_metered">Mobile hotspots</string>

    <!--  Title for menu option to enable global auto-sync of account data -->

    <string name="data_usage_menu_auto_sync">Auto-sync data</string>

    <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->

    <string name="account_settings_menu_auto_sync">Auto-sync data</string>

    <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->

    <string name="account_settings_menu_auto_sync_personal">Auto-sync personal data</string>

    <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->

    <string name="account_settings_menu_auto_sync_work">Auto-sync work data</string>



    <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->

    <string name="data_usage_change_cycle">Change cycle\u2026</string>

src/com/android/settings/DataUsageSummary.java

+1 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
                hasReadyMobileRadio(context) && isOwner && !appDetailMode);

        mMenuRestrictBackground.setChecked(mPolicyManager.getRestrictBackground());



        // TODO: Define behavior of this sync button. See: http://b/16076571

        mMenuAutoSync = menu.findItem(R.id.data_usage_menu_auto_sync);

        mMenuAutoSync.setChecked(ContentResolver.getMasterSyncAutomatically());

        mMenuAutoSync.setVisible(!appDetailMode);

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public class Settings extends SettingsActivity { 
    public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }

    public static class CryptKeeperSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DeviceAdminSettingsActivity extends SettingsActivity { /* empty */ }