diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-01-11 15:09:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-11 15:09:05 -0800 |
| commit | 8c1524d37adf46a0738b51dbf8c7a1c895761b1f (patch) | |
| tree | 5ae737ca30bbfbfa8f5892d0f4bc7d4d81d4be47 /res | |
| parent | c35b1a23596ca9d9afc241008cc621927fffe43c (diff) | |
| parent | 52e589156095c791ebd54fcba104bd53d8169b24 (diff) | |
| download | packages_apps_settings-8c1524d37adf46a0738b51dbf8c7a1c895761b1f.zip packages_apps_settings-8c1524d37adf46a0738b51dbf8c7a1c895761b1f.tar.gz packages_apps_settings-8c1524d37adf46a0738b51dbf8c7a1c895761b1f.tar.bz2 | |
Merge "Disable quicklaunch settings preference." into honeycomb
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/application_settings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml index 9042ba9..a06377d 100644 --- a/res/xml/application_settings.xml +++ b/res/xml/application_settings.xml @@ -34,6 +34,7 @@ android:entries="@array/app_install_location_entries" android:entryValues="@array/app_install_location_values"/> + <!-- Disabled quick launch settings pending UI redesign. <PreferenceScreen android:key="quick_launch" android:title="@string/quick_launch_title" @@ -42,7 +43,8 @@ android:targetPackage="com.android.settings" android:targetClass="com.android.settings.quicklaunch.QuickLaunchSettings" /> </PreferenceScreen> - + --> + <PreferenceScreen android:fragment="com.android.settings.applications.ManageApplications" android:title="@string/manageapplications_settings_title" |