karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Update sync to Google Drive setting

Browse Source
This commit is contained in:
Jimmy Shih
2014-01-07 17:02:02 -08:00
parent 76e44794ff
commit 29cffa96e6
10 changed files with 348 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/keys.xml
-1
View File
@@ -73,7 +73,6 @@ limitations under the License.
<!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
<string name="settings_advanced_key">settingsAdvanced</string>
<string name="settings_chart_key">settingsChart</string>
<string name="settings_google_key">settingsGoogle</string>
<string name="settings_map_key">settingsMap</string>
<string name="settings_map_medium_display_key">settingsMapMediumDisplay</string>
<string name="settings_map_percentage_display_key">settingsMapPercentageDisplay</string>
MyTracks/res/values/strings.xml
+6 -29
View File
@@ -1553,37 +1553,14 @@ limitations under the License.
</string>
<!-- Settings Google -->
<string name="settings_google"
translation_description="In the 'Settings' page, the option to change the accounts and sync
settings.
Character limit: ~23 (1 line)">
Accounts &amp; sync
</string>
<string name="settings_google_account_confirm_message"
translation_description="In the 'Accounts and sync' settings, the confirmation message when
switching account.
%1$s account name. E.g., 'foo@foo.com'.">
This will remove any association between your tracks and %1$s Google Drive. Google Drive sync
will be turned off. No tracks will be deleted on %1$s Google Drive.
</string>
<string name="settings_google_account_confirm_title"
translation_description="In the 'Accounts and sync' settings, after pressing 'Switch account',
the title of the confirmation dialog.">
Switch account?
</string>
<string name="settings_google_account_title"
translation_description="In the 'Accounts and sync' settings, the option to switch Google
account.
Character limit: ~23 (1 line)">
Switch account
<string name="settings_google_drive_sync_no_account"
translation_description="In the 'Sync to Google Drive' setting, the message when no account is
found to sync to Google Drive.">
No account found to sync to Google Drive
</string>
<string name="settings_google_drive_sync_summary_on"
translation_description="In the 'Accounts and sync' settings, the summary for the 'Sync to
Google Drive' checkbox when it is checked explaining that all tracks will be synced to a
Google Drive account.
translation_description="In the 'Sync to Google Drive' setting, the summary explaining that all
tracks will be synced to a Google Drive account.
%1$s account name. E.g., 'foo@foo.com'.">
All tracks will be synced to %1$s Google Drive
MyTracks/res/xml/google_settings.xml
-27
View File
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2013 Google Inc.
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"
android:title="@string/settings_google" >
<com.google.android.apps.mytracks.settings.MyTracksListPreference
android:defaultValue=""
android:key="@string/google_account_key"
android:title="@string/settings_google_account_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/drive_sync_key"
android:title="@string/menu_sync_drive" />
</PreferenceScreen>
MyTracks/res/xml/settings.xml
+4 -4
View File
@@ -16,10 +16,10 @@ limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/menu_settings" >
<Preference
android:key="@string/settings_google_key"
android:persistent="false"
android:title="@string/settings_google" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/drive_sync_key"
android:title="@string/menu_sync_drive" />
<Preference
android:key="@string/settings_map_key"
android:persistent="false"