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 --- tests/src/com/android/settings/SettingsHookTests.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/src/com/android/settings/SettingsHookTests.java b/tests/src/com/android/settings/SettingsHookTests.java index ec438cb..4dfd484 100644 --- a/tests/src/com/android/settings/SettingsHookTests.java +++ b/tests/src/com/android/settings/SettingsHookTests.java @@ -16,20 +16,15 @@ package com.android.settings; +import com.android.settings.Settings; import com.android.settings.tests.Manufacturer; import com.android.settings.tests.Operator; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.res.Resources; -import android.os.Bundle; -import android.preference.Preference; -import android.preference.PreferenceGroup; import android.test.ActivityInstrumentationTestCase2; import java.util.List; -- cgit v1.1