From b923194def45cd1f6552143e47a5a4ff46bed3f6 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Tue, 15 Oct 2024 04:09:28 +0000 Subject: [PATCH] [Catalyst] Vibration and haptics screen migration - Add a flag for vibration and haptics migration - Add skeleton of vibration and haptics Bug: 368360218 Test: atest VibrationIntensityScreenTest Flag: com.android.settings.flags.catalyst_vibration_intensity_screen Change-Id: I0117f570fe9bf92e61974984d00c0bd5be684fff --- aconfig/catalyst/sound_screen.aconfig | 7 +++ .../accessibility/VibrationIntensityScreen.kt | 46 +++++++++++++++++++ .../VibrationIntensitySettingsFragment.java | 7 +++ .../VibrationIntensityScreenTest.kt | 37 +++++++++++++++ 4 files changed, 97 insertions(+) create mode 100644 src/com/android/settings/accessibility/VibrationIntensityScreen.kt create mode 100644 tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt diff --git a/aconfig/catalyst/sound_screen.aconfig b/aconfig/catalyst/sound_screen.aconfig index ea5f77131dc..ac7f8bc1b80 100644 --- a/aconfig/catalyst/sound_screen.aconfig +++ b/aconfig/catalyst/sound_screen.aconfig @@ -6,4 +6,11 @@ flag { namespace: "android_settings" description: "Flag for sound and vibration page" bug: "323791114" +} + +flag { + name: "catalyst_vibration_intensity_screen" + namespace: "android_settings" + description: "Flag for vibration and haptics page" + bug: "323791114" } \ No newline at end of file diff --git a/src/com/android/settings/accessibility/VibrationIntensityScreen.kt b/src/com/android/settings/accessibility/VibrationIntensityScreen.kt new file mode 100644 index 00000000000..5d7d4fbfe45 --- /dev/null +++ b/src/com/android/settings/accessibility/VibrationIntensityScreen.kt @@ -0,0 +1,46 @@ +/* + * 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.accessibility + +import android.content.Context +import androidx.fragment.app.Fragment +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 VibrationIntensityScreen : PreferenceScreenCreator { + override val key: String + get() = KEY + + override val title: Int + get() = R.string.accessibility_vibration_settings_title + + override fun isFlagEnabled(context: Context): Boolean = Flags.catalystVibrationIntensityScreen() + + override fun hasCompleteHierarchy() = false + + override fun fragmentClass(): Class? = + VibrationIntensitySettingsFragment::class.java + + override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {} + + companion object { + const val KEY = "vibration_intensity_screen" + } +} diff --git a/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java b/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java index 1d24ec9e2de..328bed94403 100644 --- a/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java +++ b/src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java @@ -25,6 +25,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.RecyclerView; @@ -90,4 +92,9 @@ public class VibrationIntensitySettingsFragment extends DashboardFragment { return VibrationIntensitySettingsFragment.isPageSearchEnabled(context); } }; + + @Override + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { + return VibrationIntensityScreen.KEY; + } } diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt new file mode 100644 index 00000000000..99851de6ac2 --- /dev/null +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt @@ -0,0 +1,37 @@ +/* + * 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.accessibility + +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 VibrationIntensityScreenTest : CatalystScreenTestCase() { + + override val preferenceScreenCreator = VibrationIntensityScreen() + + override val flagName: String + get() = Flags.FLAG_CATALYST_VIBRATION_INTENSITY_SCREEN + + @Test + fun key() { + assertThat(preferenceScreenCreator.key).isEqualTo(VibrationIntensityScreen.KEY) + } +}