diff --git a/res/values/strings.xml b/res/values/strings.xml index 0e52112e8db..402242356c5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4276,6 +4276,8 @@ Downloaded services Experimental + + Feature flags Talkback diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 89924467221..92205e44a7b 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -167,6 +167,11 @@ android:key="camera_hal_hdrplus_switch" android:title="@string/camera_hal_hdrplus_switch" /> + + getPreferenceControllers(Context context) { + return null; + } +} diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider index c6d4bdac0f5..9b86ced2984 100644 --- a/tests/robotests/assets/grandfather_not_implementing_index_provider +++ b/tests/robotests/assets/grandfather_not_implementing_index_provider @@ -4,6 +4,7 @@ com.android.settings.bluetooth.BluetoothPairingDetail com.android.settings.accounts.AccountDetailDashboardFragment com.android.settings.fuelgauge.PowerUsageAnomalyDetails com.android.settings.fuelgauge.AdvancedPowerUsageDetail +com.android.settings.development.featureflags.FeatureFlagsDashboard com.android.settings.deviceinfo.StorageProfileFragment com.android.settings.wifi.details.WifiNetworkDetailsFragment com.android.settings.wifi.p2p.WifiP2pSettings diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java new file mode 100644 index 00000000000..92e92fc218d --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java @@ -0,0 +1,58 @@ +/* + * 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.development.featureflags; + +import static com.google.common.truth.Truth.assertThat; + +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class FeatureFlagsDashboardTest { + + private FeatureFlagsDashboard mDashboard; + + @Before + public void setUp() { + mDashboard = new FeatureFlagsDashboard(); + } + + @Test + public void shouldNotHaveHelpResource() { + assertThat(mDashboard.getHelpResource()).isEqualTo(0); + } + + @Test + public void shouldLogAsFeatureFlagPage() { + assertThat(mDashboard.getMetricsCategory()) + .isEqualTo(MetricsProto.MetricsEvent.SETTINGS_FEATURE_FLAGS_DASHBOARD); + } + + @Test + public void shouldUsePlaceholderPreferenceLayout() { + assertThat(mDashboard.getPreferenceScreenResId()) + .isEqualTo(R.xml.placeholder_prefs); + } +}