summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/deviceinfo
diff options
context:
space:
mode:
authorFan Zhang <zhfan@google.com>2018-02-06 14:21:01 -0800
committerFan Zhang <zhfan@google.com>2018-02-07 10:27:18 -0800
commitf11c8857665cfa0599f96b7b08055302aa3d197f (patch)
tree65b8c4a5fff3e0d2b86968b7ac3c77e110923853 /src/com/android/settings/deviceinfo
parent6013a95b9e582dc1344f000b7c495d410192faf0 (diff)
downloadpackages_apps_Settings-f11c8857665cfa0599f96b7b08055302aa3d197f.tar.gz
packages_apps_Settings-f11c8857665cfa0599f96b7b08055302aa3d197f.tar.bz2
packages_apps_Settings-f11c8857665cfa0599f96b7b08055302aa3d197f.zip
Pre-fixup for nav up button
- Remove SettingsDrawerActivity.EXTRA_SHOW_MENU and force up nav button to always show. The button doesn't do anything yet. It just finishes current activity. - Remove dead code about suggestions Change-Id: I61fa9fefbaa9bced841a05969544b1c824c564ce Bug: 72337421 Test: rebuild
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r--src/com/android/settings/deviceinfo/StorageSettings.java1
-rw-r--r--src/com/android/settings/deviceinfo/storage/UserProfileController.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index efcf03db02..209346913b 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -236,7 +236,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
StorageDashboardFragment.class.getName(), args, null,
R.string.storage_settings, null, false, getMetricsCategory());
- intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
getActivity().startActivity(intent);
finish();
}
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index 4870e7e3fa..c9fe54e74f 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -85,7 +85,6 @@ public class UserProfileController extends AbstractPreferenceController implemen
Intent intent = Utils.onBuildStartFragmentIntent(mContext,
StorageProfileFragment.class.getName(), args, null, 0,
mUser.name, false, MetricsProto.MetricsEvent.DEVICEINFO_STORAGE);
- intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
mContext.startActivity(intent);
return true;
}