diff --git a/aconfig/catalyst/connected_devices.aconfig b/aconfig/catalyst/connected_devices.aconfig new file mode 100644 index 00000000000..7a335fa4675 --- /dev/null +++ b/aconfig/catalyst/connected_devices.aconfig @@ -0,0 +1,9 @@ +package: "com.android.settings.flags" +container: "system" + +flag { + name: "catalyst_bluetooth_switchbar_screen" + namespace: "android_settings" + description: "Flag for Bluetooth" + bug: "323791114" +} diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index 66f2f1b8f31..90ef5b95b63 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -21,6 +21,8 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.settings.R; @@ -120,4 +122,9 @@ public class BluetoothDashboardFragment extends DashboardFragment { */ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = new BaseSearchIndexProvider(R.xml.bluetooth_screen); + + @Override + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { + return BluetoothDashboardScreen.KEY; + } } diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt b/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt new file mode 100644 index 00000000000..66fd8b17394 --- /dev/null +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 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.connecteddevice + +import android.content.Context +import com.android.settings.R +import com.android.settings.flags.Flags +import com.android.settingslib.metadata.ProvidePreferenceScreen +import com.android.settingslib.metadata.preferenceHierarchy +import com.android.settingslib.preference.PreferenceScreenCreator + +@ProvidePreferenceScreen +class BluetoothDashboardScreen : PreferenceScreenCreator { + override val key: String + get() = KEY + + override val title: Int + get() = R.string.bluetooth_settings_title + + override val icon: Int + get() = R.drawable.ic_settings_bluetooth + + override fun isFlagEnabled(context: Context) = Flags.catalystBluetoothSwitchbarScreen() + + override fun hasCompleteHierarchy() = false + + override fun fragmentClass() = BluetoothDashboardFragment::class.java + + override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {} + + companion object { + const val KEY = "bluetooth_switchbar_screen" + } +} diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt new file mode 100644 index 00000000000..39c029467b4 --- /dev/null +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardScreenTest.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 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.connecteddevice + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.settings.flags.Flags +import com.android.settingslib.preference.CatalystScreenTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class BluetoothDashboardScreenTest : CatalystScreenTestCase() { + override val preferenceScreenCreator = BluetoothDashboardScreen() + + override val flagName: String + get() = Flags.FLAG_CATALYST_BLUETOOTH_SWITCHBAR_SCREEN + + @Test + fun key() { + assertThat(preferenceScreenCreator.key).isEqualTo(BluetoothDashboardScreen.KEY) + } + + override fun migration() { + } +}