Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b923194d authored by Mill Chen's avatar Mill Chen
Browse files

[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
parent aeb05239

aconfig/catalyst/sound_screen.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -7,3 +7,10 @@ flag { 
    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

src/com/android/settings/accessibility/VibrationIntensityScreen.kt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * 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<out Fragment>? =

        VibrationIntensitySettingsFragment::class.java



    override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {}



    companion object {

        const val KEY = "vibration_intensity_screen"

    }

}

src/com/android/settings/accessibility/VibrationIntensitySettingsFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -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;

    }

}

tests/robotests/src/com/android/settings/accessibility/VibrationIntensityScreenTest.kt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * 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)

    }

}