Use a config flag instead of a RO flag for showing Manage Storage. am: c0b33f70ed
am: bfe5afc270
Change-Id: I159cb08e7ef25802562603d4f8e297ffdf8d0f30
diff --git a/res/values/config.xml b/res/values/config.xml
index c8ea171..75d8697 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -55,4 +55,7 @@
<!-- When true enable gesture setting. -->
<bool name="config_gesture_settings_enabled">false</bool>
+ <!-- If the Storage Manager settings are enabled. -->
+ <bool name="config_storage_manager_settings_enabled">false</bool>
+
</resources>
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index efb1e0f..8edf16e 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -30,7 +30,6 @@
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.Environment;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageEventListener;
@@ -93,8 +92,6 @@
private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
- private static final String STORAGE_MANAGER_PROPERTY = "ro.storage_manager.enabled";
-
private static final int[] ITEMS_NO_SHOW_SHARED = new int[] {
R.string.storage_detail_apps,
R.string.storage_detail_system,
@@ -218,7 +215,7 @@
screen.removeAll();
- if (SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false)) {
+ if (getResources().getBoolean(R.bool.config_storage_manager_settings_enabled)) {
addPreference(screen, mAutomaticStorageManagement);
}
addPreference(screen, mSummary);
@@ -410,7 +407,8 @@
mount.setVisible(false);
unmount.setVisible(false);
format.setVisible(false);
- manage.setVisible(SystemProperties.getBoolean(STORAGE_MANAGER_PROPERTY, false));
+ manage.setVisible(getResources().getBoolean(
+ R.bool.config_storage_manager_settings_enabled));
} else {
rename.setVisible(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
mount.setVisible(mVolume.getState() == VolumeInfo.STATE_UNMOUNTED);
diff --git a/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java b/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
new file mode 100644
index 0000000..6289f1b
--- /dev/null
+++ b/tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.tests;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import com.android.settings.Settings;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class PrivateVolumeSettingsTest {
+ @Test
+ public void test_ManageStorageNotShown() {
+ Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+ instrumentation.startActivitySync(
+ new Intent(android.provider.Settings.ACTION_INTERNAL_STORAGE_SETTINGS));
+ onView(withText(com.android.settings.R.string.storage_menu_manage)).check(doesNotExist());
+ }
+}
\ No newline at end of file