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

Place sharing settings in ShareSettingsActivity to support

Browse Source 
ICS up navigation in the action bar.
This commit is contained in:
Jimmy Shih
2012-05-03 10:56:37 -07:00
parent 234f1f4a0a
commit 92821be777
16 changed files with 246 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/xml/preferences.xml
+8 -26
View File
@@ -14,8 +14,8 @@ 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">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/menu_settings">
<!-- Display settings -->
<PreferenceScreen android:title="@string/settings_display">
@@ -152,6 +152,12 @@ limitations under the License.
</PreferenceScreen>
<!-- Sharing -->
<Preference
android:title="@string/settings_sharing"
android:key="@string/settings_sharing_key"
android:persistent="false" />
<!-- Sensors -->
<PreferenceScreen android:title="@string/settings_sensor"
android:key="@string/sensor_options_key">
@@ -186,30 +192,6 @@ limitations under the License.
</PreferenceCategory>
</PreferenceScreen>
<!-- Sharing settings -->
<PreferenceScreen android:title="@string/settings_sharing">
<CheckBoxPreference
android:key="@string/default_map_public_key"
android:title="@string/settings_sharing_map_public"
android:summaryOn="@string/settings_sharing_map_public_summary_on"
android:summaryOff="@string/settings_sharing_map_public_summary_off"
android:defaultValue="true" />
<CheckBoxPreference
android:key="@string/share_url_only_key"
android:title="@string/settings_sharing_url_only"
android:summaryOn="@string/settings_sharing_url_only_summary_on"
android:summaryOff="@string/settings_sharing_url_only_summary_off"
android:defaultValue="false" />
<CheckBoxPreference
android:key="@string/allow_access_key"
android:title="@string/settings_sharing_allow_access"
android:summaryOn="@string/settings_sharing_allow_access_summary_on"
android:summaryOff="@string/settings_sharing_allow_access_summary_off"
android:defaultValue="false" />
</PreferenceScreen>
<!-- Backup settings -->
<PreferenceScreen android:title="@string/settings_backup">
<PreferenceCategory android:title="@string/settings_backup_sd_card">