Merge "Set config for enabling support UI in Settings"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c8ba07..871de12 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3077,7 +3077,8 @@
<activity android:name=".Settings$SupportDashboardActivity"
android:label="@string/page_tab_title_support"
- android:icon="@drawable/ic_help">
+ android:icon="@drawable/ic_help"
+ android:enabled="@bool/config_support_enabled">
<intent-filter android:priority="0">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
diff --git a/res/values/config.xml b/res/values/config.xml
index 1ebc4c7..0fa2b71 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -64,4 +64,7 @@
<!-- If the Storage Manager settings are enabled. -->
<bool name="config_storage_manager_settings_enabled">false</bool>
+ <!-- If the support features are enabled. -->
+ <bool name="config_support_enabled">false</bool>
+
</resources>
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
new file mode 100644
index 0000000..7c1d587
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 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.support;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SupportConfigTest {
+
+ @Test
+ public void getConfigForSupportFeature_shouldBeDisabled() {
+ final boolean supportEnabled = RuntimeEnvironment.application.getResources()
+ .getBoolean(R.bool.config_support_enabled);
+ assertThat(supportEnabled).isFalse();
+ }
+}