From 263bcc8b732dbb47d3ce63904e0e05191fabbad6 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Fri, 17 Jan 2014 19:17:58 -0800 Subject: Use Drawer in Settings app - get rid of PreferenceActivity as much as we can and use fragments instead - add Drawer widget - add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL) - add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external call thru an Intent Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we would have two Home). Also, verified that: - the WiFi settings still work when called from SetupWizard - when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90 --- src/com/android/settings/CryptKeeperSettings.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/com/android/settings/CryptKeeperSettings.java') diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index 58d97a82f..cedf53034 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -30,7 +30,6 @@ import android.content.res.Resources; import android.os.BatteryManager; import android.os.Bundle; import android.preference.Preference; -import android.preference.PreferenceActivity; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -201,6 +200,6 @@ public class CryptKeeperSettings extends Fragment { preference.setFragment(CryptKeeperConfirm.class.getName()); preference.setTitle(R.string.crypt_keeper_confirm_title); preference.getExtras().putString("password", password); - ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference); + ((SettingsActivity) getActivity()).onPreferenceStartFragment(null, preference); } } -- cgit v1.2.3