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
This commit is contained in:
@@ -47,7 +47,6 @@ import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.preference.Preference;
|
||||
import android.preference.Preference.OnPreferenceClickListener;
|
||||
import android.preference.PreferenceActivity;
|
||||
import android.preference.PreferenceGroup;
|
||||
import android.provider.ContactsContract;
|
||||
import android.provider.ContactsContract.Contacts;
|
||||
@@ -67,6 +66,7 @@ import com.android.settings.OwnerInfoSettings;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.RestrictedSettingsFragment;
|
||||
import com.android.settings.SelectableEditTextPreference;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.Utils;
|
||||
|
||||
public class UserSettings extends RestrictedSettingsFragment
|
||||
@@ -377,7 +377,7 @@ public class UserSettings extends RestrictedSettingsFragment
|
||||
Bundle extras = new Bundle();
|
||||
extras.putInt(RestrictedProfileSettings.EXTRA_USER_ID, userId);
|
||||
extras.putBoolean(RestrictedProfileSettings.EXTRA_NEW_USER, newUser);
|
||||
((PreferenceActivity) getActivity()).startPreferencePanel(
|
||||
((SettingsActivity) getActivity()).startPreferencePanel(
|
||||
RestrictedProfileSettings.class.getName(),
|
||||
extras, R.string.user_restrictions_title, null,
|
||||
null, 0);
|
||||
@@ -390,7 +390,7 @@ public class UserSettings extends RestrictedSettingsFragment
|
||||
int titleResId = info.id == UserHandle.USER_OWNER ? R.string.owner_info_settings_title
|
||||
: (info.isRestricted() ? R.string.profile_info_settings_title
|
||||
: R.string.user_info_settings_title);
|
||||
((PreferenceActivity) getActivity()).startPreferencePanel(
|
||||
((SettingsActivity) getActivity()).startPreferencePanel(
|
||||
OwnerInfoSettings.class.getName(),
|
||||
extras, titleResId, null, null, 0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user