Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev am: 39d2913e1c

am: 5ba545ee06

* commit '5ba545ee0667553265e707c0ce08b4496089c75a':
  Hide the Deletion Helper entry points from Settings.

Change-Id: I5791f07e9ae06e19e0ccc5219c8cfad33b61f1d0
This commit is contained in:
Daniel Nishi
2016-05-26 20:34:48 +00:00
committed by android-build-merger

View File

@@ -396,7 +396,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
mount.setVisible(false); mount.setVisible(false);
unmount.setVisible(false); unmount.setVisible(false);
format.setVisible(false); format.setVisible(false);
manage.setVisible(true); manage.setVisible(getResources().getBoolean(R.bool.config_has_storage_manager));
} else { } else {
rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE); rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED); mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);