diff options
author | Michael Chan <mchan@android.com> | 2009-12-03 00:31:59 -0800 |
---|---|---|
committer | Michael Chan <mchan@android.com> | 2009-12-03 20:32:38 -0800 |
commit | 0bd445b974292dc3910b6bb85dcee7e7c378968f (patch) | |
tree | feed9649d176316055513e7fd90420caf1b5cf89 /res/xml | |
parent | 3327f7887328c55ef2d837a8e2a07cea2070c744 (diff) | |
download | packages_apps_settings-0bd445b974292dc3910b6bb85dcee7e7c378968f.zip packages_apps_settings-0bd445b974292dc3910b6bb85dcee7e7c378968f.tar.gz packages_apps_settings-0bd445b974292dc3910b6bb85dcee7e7c378968f.tar.bz2 |
b/2296110 New Dialog which appears when phone is place on dock.
Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/sound_and_display_settings.xml | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml index 151b0fb..1ffbdbf 100644 --- a/res/xml/sound_and_display_settings.xml +++ b/res/xml/sound_and_display_settings.xml @@ -4,9 +4,9 @@ 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. @@ -16,7 +16,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"> - + <PreferenceCategory android:key="sound_settings" android:title="@string/sound_settings"> @@ -50,12 +50,9 @@ <PreferenceScreen android:key="dock_settings" android:order="4" - android:title="@string/dock_settings_title"> - <intent - android:action="android.intent.action.MAIN" - android:targetPackage="com.android.settings" - android:targetClass="com.android.settings.bluetooth.DockSettingsActivity" /> - </PreferenceScreen> + android:title="@string/dock_settings_title" + android:summary="@string/dock_settings_summary" + android:widgetLayout="@*android:layout/preference_dialog" /> <com.android.settings.DefaultRingtonePreference android:key="ringtone" @@ -66,14 +63,14 @@ android:dependency="silent" android:order="5" android:ringtoneType="ringtone" /> - + <CheckBoxPreference android:key="vibrate" android:title="@string/vibrate_title" android:summary="@string/vibrate_summary" android:order="6" android:persistent="false" /> - + <com.android.settings.DefaultRingtonePreference android:key="notification_sound" android:title="@string/notification_sound_title" @@ -139,15 +136,15 @@ <PreferenceCategory android:title="@string/display_settings"> - <CheckBoxPreference - android:key="accelerometer" - android:title="@string/accelerometer_title" + <CheckBoxPreference + android:key="accelerometer" + android:title="@string/accelerometer_title" android:summaryOn="@string/accelerometer_summary_on" android:summaryOff="@string/accelerometer_summary_off"/> - - <ListPreference - android:key="animations" - android:title="@string/animations_title" + + <ListPreference + android:key="animations" + android:title="@string/animations_title" android:persistent="false" android:entries="@array/animations_entries" android:entryValues="@array/animations_values" /> @@ -158,7 +155,7 @@ android:summary="@string/brightness_summary" android:dialogIcon="@drawable/ic_popup_brightness" android:dialogTitle="@string/brightness" /> - + <ListPreference android:key="screen_timeout" android:title="@string/screen_timeout" @@ -168,4 +165,4 @@ android:entryValues="@array/screen_timeout_values" /> </PreferenceCategory> -</PreferenceScreen> +</PreferenceScreen> |