am dad6577f: Merge "Remove popup indicator for dialog style preferences." into honeycomb

* commit 'dad6577fdd694482cb9ea4469cafed9d17b06635':
  Remove popup indicator for dialog style preferences.
This commit is contained in:
Amith Yamasani
2011-01-12 15:03:00 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 4 deletions

View File

@@ -23,8 +23,7 @@
<PreferenceScreen <PreferenceScreen
android:key="dock_audio" android:key="dock_audio"
android:title="@string/dock_audio_settings_title" android:title="@string/dock_audio_settings_title"
android:summary="@string/dock_settings_summary" android:summary="@string/dock_settings_summary" />
android:widgetLayout="@*android:layout/preference_dialog" />
<CheckBoxPreference <CheckBoxPreference
android:key="dock_sounds" android:key="dock_sounds"

View File

@@ -58,8 +58,7 @@
<PreferenceCategory android:key="keyboard_settings_category" <PreferenceCategory android:key="keyboard_settings_category"
android:title="@string/keyboard_settings_category"> android:title="@string/keyboard_settings_category">
<PreferenceScreen android:key="current_input_method" <PreferenceScreen android:key="current_input_method"
android:title="@string/current_input_method" android:title="@string/current_input_method" />
android:widgetLayout="@*android:layout/preference_dialog" />
<ListPreference android:key="input_method_selector" <ListPreference android:key="input_method_selector"
android:title="@string/input_method_selector" android:title="@string/input_method_selector"