Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev

am: 97ac5c773d

* commit '97ac5c773da07d637ef0e92edbde4052714683ab':
  Update the storage manager settings to match the mocks.

Change-Id: I9c6ed838d3f58fb97c93779c9378f59bb88b1b66
This commit is contained in:
Daniel Nishi
2016-05-24 21:32:37 +00:00
committed by android-build-merger
4 changed files with 71 additions and 38 deletions

View File

@@ -170,7 +170,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
mCurrentUser = mUserManager.getUserInfo(UserHandle.myUserId());
mExplore = buildAction(R.string.storage_menu_explore);
mAutomaticStorageManagement = buildAction(R.string.storage_settings);
mAutomaticStorageManagement = buildAction(R.string.storage_menu_manage);
mNeedsUpdate = true;
@@ -485,7 +485,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
case R.string.storage_menu_explore: {
intent = mSharedVolume.buildBrowseIntent();
} break;
case R.string.storage_settings: {
case R.string.storage_menu_manage: {
startFragment(this, AutomaticStorageManagerSettings.class.getCanonicalName(),
R.string.automatic_storage_manager_settings, 0, null);
return true;