PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""

Browse Source 
* commit '6d839875b74f1570e8807005c586298beb677413':
  Revert "Revert "Move global sync settings to AccountSettings.""
This commit is contained in:
Alexandra Gherghina
2014-07-22 21:39:17 +00:00
committed by Android Git Automerger
parent badae7d895 6d839875b7
commit 534b84e9f8
9 changed files with 134 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/menu/account_settings.xml Normal file
View File

@@ -0,0 +1,30 @@
<?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>

6
res/values/strings.xml
View File

@@ -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>