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

Commit f4f918e5 authored by Fan Wu's avatar Fan Wu
Browse files

Add metric and highlight key for a11y screens 

Bug: 409940414
Test: atest
Flag: EXEMPT refactor
NO_IFTTT=no logic change
Change-Id: Id9aade1c472ead37db1e338940ccd9b409651b22
parent fff4abbc

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

+8 −3
Original line number Diff line number Diff line
@@ -16,23 +16,23 @@ 


package com.android.settings.accessibility



import android.app.settings.SettingsEnums

import android.content.Context

import android.hardware.display.ColorDisplayManager

import com.android.settings.R

import com.android.settings.Settings.ColorAndMotionActivity

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.display.darkmode.DarkModeScreen

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent

import com.android.settingslib.metadata.PreferenceCategory

import com.android.settingslib.metadata.PreferenceGroup

import com.android.settingslib.metadata.PreferenceHierarchy

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen(ColorAndMotionScreen.KEY)

class ColorAndMotionScreen : PreferenceScreenCreator {

open class ColorAndMotionScreen : PreferenceScreenMixin {

    override val key: String

        get() = KEY
@@ -42,6 +42,11 @@ class ColorAndMotionScreen : PreferenceScreenCreator { 
    override val icon: Int

        get() = R.drawable.ic_color_and_motion



    override fun getMetricsCategory() = SettingsEnums.ACCESSIBILITY_COLOR_AND_MOTION



    override val highlightMenuKey

        get() = R.string.menu_key_accessibility



    override fun isFlagEnabled(context: Context) = Flags.catalystAccessibilityColorAndMotion()



    override fun hasCompleteHierarchy(): Boolean = true

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

+8 −2
Original line number Diff line number Diff line
@@ -15,20 +15,26 @@ 
 */

package com.android.settings.accessibility



import android.app.settings.SettingsEnums

import android.content.Context

import com.android.settings.R

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



// @ProvidePreferenceScreen(TextReadingScreen.KEY)

class TextReadingScreen : PreferenceScreenCreator {

open class TextReadingScreen : PreferenceScreenMixin {

    override val key: String

        get() = KEY



    override val title: Int

        get() = R.string.accessibility_text_reading_options_title



    override fun getMetricsCategory() = SettingsEnums.ACCESSIBILITY_TEXT_READING_OPTIONS



    override val highlightMenuKey

        get() = R.string.menu_key_accessibility



    override fun isFlagEnabled(context: Context) = Flags.catalystTextReadingScreen()



    override fun fragmentClass() = TextReadingPreferenceFragment::class.java

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

+8 −2
Original line number Diff line number Diff line
@@ -15,17 +15,18 @@ 
 */

package com.android.settings.accessibility



import android.app.settings.SettingsEnums

import android.content.Context

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.Settings.VibrationIntensitySettingsActivity

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent

import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



/** Accessibility settings for vibration intensities. */

// TODO(b/368360218): investigate if we still need this screen once we finish the migration.
@@ -33,7 +34,7 @@ import com.android.settingslib.preference.PreferenceScreenCreator 
//  between toggle or slider preferences based on device config, depending on how overlays are done.

// LINT.IfChange

@ProvidePreferenceScreen(VibrationIntensityScreen.KEY)

open class VibrationIntensityScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {

open class VibrationIntensityScreen : PreferenceScreenMixin, PreferenceAvailabilityProvider {

    override val key: String

        get() = KEY
@@ -43,9 +44,14 @@ open class VibrationIntensityScreen : PreferenceScreenCreator, PreferenceAvailab 
    override val keywords: Int

        get() = R.string.keywords_vibration



    override fun getMetricsCategory() = SettingsEnums.ACCESSIBILITY_VIBRATION



    override fun isAvailable(context: Context) =

        context.hasVibrator && context.getSupportedVibrationIntensityLevels() > 1



    override val highlightMenuKey

        get() = R.string.menu_key_accessibility



    override fun isFlagEnabled(context: Context): Boolean = Flags.catalystVibrationIntensityScreen()



    override fun hasCompleteHierarchy() = false

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

+8 −2
Original line number Diff line number Diff line
@@ -15,21 +15,22 @@ 
 */

package com.android.settings.accessibility



import android.app.settings.SettingsEnums

import android.content.Context

import android.os.Vibrator

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settingslib.metadata.PreferenceAvailabilityProvider

import com.android.settingslib.metadata.PreferenceCategory

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



/** Accessibility settings for vibration. */

// LINT.IfChange

@ProvidePreferenceScreen(VibrationScreen.KEY)

class VibrationScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider {

open class VibrationScreen : PreferenceScreenMixin, PreferenceAvailabilityProvider {

    override val key: String

        get() = KEY
@@ -39,9 +40,14 @@ class VibrationScreen : PreferenceScreenCreator, PreferenceAvailabilityProvider 
    override val keywords: Int

        get() = R.string.keywords_vibration



    override fun getMetricsCategory()= SettingsEnums.ACCESSIBILITY_VIBRATION



    override fun isAvailable(context: Context) =

        context.hasVibrator && context.getSupportedVibrationIntensityLevels() == 1



    override val highlightMenuKey

        get() = R.string.menu_key_accessibility



    override fun isFlagEnabled(context: Context): Boolean = Flags.catalystVibrationIntensityScreen()



    override fun hasCompleteHierarchy() = false