Remove drawer from settings
Change-Id: Ib11376206cf8366c86c427104c47740c3ca8b0d0
Fix: 35809663
Test: make RunSettingsRoboTests
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 00bdf57..84901fb 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -58,7 +58,6 @@
import com.android.settings.core.gateway.SettingsGateway;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.core.instrumentation.SharedPreferencesLogger;
-import com.android.settings.dashboard.DashboardContainerFragment;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.DashboardSummary;
import com.android.settings.dashboard.SearchResultsSummary;
@@ -154,6 +153,7 @@
public static final String EXTRA_SHOW_FRAGMENT_AS_SUBSETTING =
":settings:show_fragment_as_subsetting";
+ @Deprecated
public static final String EXTRA_HIDE_DRAWER = ":settings:hide_drawer";
public static final String META_DATA_KEY_FRAGMENT_CLASS =
@@ -367,9 +367,6 @@
if (intent.hasExtra(EXTRA_UI_OPTIONS)) {
getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0));
}
- if (intent.getBooleanExtra(EXTRA_HIDE_DRAWER, false)) {
- setIsDrawerPresent(false);
- }
mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
Context.MODE_PRIVATE);
@@ -461,17 +458,8 @@
mDisplaySearch = true;
mInitialTitleResId = R.string.dashboard_title;
- // add argument to indicate which settings tab should be initially selected
- final Bundle args = new Bundle();
- final String extraName = DashboardContainerFragment.EXTRA_SELECT_SETTINGS_TAB;
- args.putString(extraName, intent.getStringExtra(extraName));
- if (isDashboardFeatureEnabled()) {
- switchToFragment(DashboardSummary.class.getName(), args, false, false,
+ switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
mInitialTitleResId, mInitialTitle, false);
- } else {
- switchToFragment(DashboardContainerFragment.class.getName(), args, false, false,
- mInitialTitleResId, mInitialTitle, false);
- }
}
}
@@ -957,12 +945,7 @@
if (UserHandle.MU_ENABLED && !isAdmin) {
// When on restricted users, disable all extra categories (but only the settings ones).
- List<DashboardCategory> categories;
- if (isDashboardFeatureEnabled()) {
- categories = mDashboardFeatureProvider.getAllCategories();
- } else {
- categories = getDashboardCategories();
- }
+ final List<DashboardCategory> categories = mDashboardFeatureProvider.getAllCategories();
for (DashboardCategory category : categories) {
for (Tile tile : category.tiles) {
@@ -1017,15 +1000,6 @@
}
}
- @Override
- protected boolean isDashboardFeatureEnabled() {
- if (mDashboardFeatureProvider == null) {
- mDashboardFeatureProvider =
- FeatureFactory.getFactory(this).getDashboardFeatureProvider(this);
- }
- return mDashboardFeatureProvider.isEnabled();
- }
-
// give subclasses access to the Next button
public boolean hasNextButton() {
return mNextButton != null;
@@ -1085,16 +1059,6 @@
}
@Override
- protected void onTileClicked(Tile tile) {
- if (mIsShowingDashboard) {
- // If on dashboard, don't finish so the back comes back to here.
- openTile(tile);
- } else {
- super.onTileClicked(tile);
- }
- }
-
- @Override
public void onProfileTileOpen() {
if (!mIsShowingDashboard) {
finish();