Fork a new developer options page.
- Create a new activity/fragment and add it to manifest - Mark old activity/fragment deprecated - Enable/disable the new activity based on FeatureFlag - Initial skeleton code for new fragment Bug: 65522852 Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest Change-Id: Ib1395693f8b6f61d4726573a9ea841ea53cf207b
This commit is contained in:
46
tests/robotests/src/android/util/FeatureFlagUtils.java
Normal file
46
tests/robotests/src/android/util/FeatureFlagUtils.java
Normal file
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* 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 android.util;
|
||||
|
||||
import android.os.SystemProperties;
|
||||
import android.text.TextUtils;
|
||||
|
||||
/**
|
||||
* This class is only needed to get around Robolectric issue.
|
||||
*/
|
||||
public class FeatureFlagUtils {
|
||||
public static final String FFLAG_PREFIX = "sys.fflag.";
|
||||
public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";
|
||||
|
||||
/**
|
||||
* Whether or not a flag is enabled.
|
||||
*
|
||||
* @param feature the flag name
|
||||
* @return true if the flag is enabled (either by default in system, or override by user)
|
||||
*/
|
||||
public static boolean isEnabled(String feature) {
|
||||
// Tries to get feature flag from system property.
|
||||
// Step 1: check if feature flag has any override. Flag name: sys.fflag.override.<feature>
|
||||
String value = SystemProperties.get(FFLAG_OVERRIDE_PREFIX + feature);
|
||||
if (!TextUtils.isEmpty(value)) {
|
||||
return Boolean.parseBoolean(value);
|
||||
}
|
||||
// Step 2: check if feature flag has any default value. Flag name: sys.fflag.<feature>
|
||||
value = SystemProperties.get(FFLAG_PREFIX + feature);
|
||||
return Boolean.parseBoolean(value);
|
||||
}
|
||||
}
|
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.SearchIndexableResource;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import com.android.settingslib.development.DevelopmentSettingsEnabler;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
||||
shadows = {
|
||||
SettingsShadowResources.class,
|
||||
SettingsShadowResources.SettingsShadowTheme.class
|
||||
})
|
||||
public class DevelopmentSettingsDashboardFragmentTest {
|
||||
|
||||
private DevelopmentSettingsDashboardFragment mDashboard;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mDashboard = new DevelopmentSettingsDashboardFragment();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldNotHaveHelpResource() {
|
||||
assertThat(mDashboard.getHelpResource()).isEqualTo(0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldLogAsFeatureFlagPage() {
|
||||
assertThat(mDashboard.getMetricsCategory())
|
||||
.isEqualTo(MetricsProto.MetricsEvent.DEVELOPMENT);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void searchIndex_shouldIndexFromPrefXml() {
|
||||
final List<SearchIndexableResource> index =
|
||||
DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
|
||||
.getXmlResourcesToIndex(RuntimeEnvironment.application, true);
|
||||
|
||||
assertThat(index.size()).isEqualTo(1);
|
||||
assertThat(index.get(0).xmlResId).isEqualTo(R.xml.development_prefs);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void searchIndex_pageDisabled_shouldAddAllKeysToNonIndexable() {
|
||||
final Context appContext = RuntimeEnvironment.application;
|
||||
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, false);
|
||||
|
||||
final List<String> nonIndexableKeys =
|
||||
DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
|
||||
.getNonIndexableKeys(appContext);
|
||||
|
||||
assertThat(nonIndexableKeys).contains("development_prefs_screen");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void searchIndex_pageEnabled_shouldNotAddKeysToNonIndexable() {
|
||||
final Context appContext = RuntimeEnvironment.application;
|
||||
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, true);
|
||||
|
||||
final List<String> nonIndexableKeys =
|
||||
DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
|
||||
.getNonIndexableKeys(appContext);
|
||||
|
||||
assertThat(nonIndexableKeys).doesNotContain("development_prefs_screen");
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user