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

move remaining dock settings into sound settings fragment.

Browse Source 
Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
This commit is contained in:
Chris Wren
2012-09-24 14:23:46 -04:00
parent 7fb91855b0
commit 2bc32ae808
7 changed files with 132 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
res/xml/dock_settings.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 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"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/dock_settings_title"
android:key="parent">
<PreferenceScreen
android:key="dock_audio"
android:title="@string/dock_audio_settings_title"
android:summary="@string/dock_settings_summary" />
<CheckBoxPreference
android:key="dock_sounds"
android:title="@string/dock_sounds_enable_title"
android:summaryOn="@string/dock_sounds_enable_summary_on"
android:summaryOff="@string/dock_sounds_enable_summary_off"
android:defaultValue="false" />
</PreferenceScreen>

7
res/xml/settings_headers.xml
View File

@@ -161,13 +161,6 @@
<header android:id="@+id/system_section"
android:title="@string/header_category_system" />
<!-- Dock -->
<header
android:id="@+id/dock_settings"
android:fragment="com.android.settings.DockSettings"
android:icon="@drawable/ic_settings_dock"
android:title="@string/dock_settings" />
<!-- Date & Time -->
<header
android:id="@+id/date_time_settings"

15
res/xml/sound_settings.xml
View File

@@ -88,4 +88,19 @@
android:entries="@array/emergency_tone_entries"
android:entryValues="@array/emergency_tone_values" />
<!-- Dock -->
<PreferenceCategory
android:key="dock_category"
android:title="@string/dock_settings"/>
<!-- Do not nest these, or removals in code will break -->
<PreferenceScreen
android:key="dock_audio"
android:title="@string/dock_audio_settings_title" />
<CheckBoxPreference
android:key="dock_sounds"
android:title="@string/dock_sounds_enable_title"
android:defaultValue="false" />
</PreferenceScreen>