diff --git a/res/values/config.xml b/res/values/config.xml index f5ad38b04d6..90019887aef 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -257,6 +257,9 @@ + + false + com.android.emergency diff --git a/src/com/android/settings/flashlight/FlashlightHandleActivity.java b/src/com/android/settings/flashlight/FlashlightHandleActivity.java index 0847d49d70e..6740da438cf 100644 --- a/src/com/android/settings/flashlight/FlashlightHandleActivity.java +++ b/src/com/android/settings/flashlight/FlashlightHandleActivity.java @@ -65,6 +65,11 @@ public class FlashlightHandleActivity extends Activity implements Indexable { boolean enabled) { final List result = new ArrayList<>(); + if (!context.getResources().getBoolean( + R.bool.config_settingsintelligence_slice_supported)) { + Log.d(TAG, "Search doesn't support Slice"); + return result; + } SearchIndexableRaw data = new SearchIndexableRaw(context); data.title = context.getString(R.string.power_flashlight); diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index b1d4be9ea1c..fd690c925b1 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -69,6 +69,7 @@ false false false + true false diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java new file mode 100644 index 00000000000..b0517cbfb41 --- /dev/null +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightHandleActivityTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2022 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.flashlight; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import com.android.settingslib.search.SearchIndexableRaw; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import java.util.List; + +@RunWith(RobolectricTestRunner.class) +public class FlashlightHandleActivityTest { + + private Context mContext; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + } + + @Test + public void getRawDataToIndex_sliceNotSupported_returnEmptyData() { + List data = FlashlightHandleActivity.SEARCH_INDEX_DATA_PROVIDER + .getRawDataToIndex(mContext, true /* enabled */); + + assertThat(data).isEmpty(); + } + + @Test + @Config(qualifiers = "mcc999") + public void getRawDataToIndex_sliceSupported_returnData() { + List data = FlashlightHandleActivity.SEARCH_INDEX_DATA_PROVIDER + .getRawDataToIndex(mContext, true /* enabled */); + + assertThat(data).isNotEmpty(); + } +} diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java index 02f1a23a790..abb88ae4931 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java @@ -12,7 +12,6 @@ * 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.flashlight; @@ -38,7 +37,6 @@ import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; -import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowCameraCharacteristics; import org.robolectric.shadows.ShadowCameraManager;