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

Commit a4ed5ec1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Add highlight and metric key for screenes" into main

parents 3661cb6b ec2dfb52

src/com/android/settings/notification/modes/devicestate/ZenModeBedtimeScreen.kt

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.settings.SettingsEnums 
import android.content.Context

import android.content.Intent

import android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID

import com.android.settings.CatalystFragment

import com.android.settings.R

import com.android.settings.Settings.ModeSettingsActivity

import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
@@ -59,8 +58,6 @@ open class ZenModeBedtimeScreen : 


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



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



    override fun isAvailable(context: Context) = context.hasBedtimeMode()



    override fun getTitle(context: Context): CharSequence? = context.getBedtimeMode()?.name

src/com/android/settings/notification/modes/devicestate/ZenModeDndDisplayScreen.kt

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.settings.SettingsEnums 
import android.content.Context

import android.content.Intent

import android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID

import com.android.settings.CatalystFragment

import com.android.settings.R

import com.android.settings.Settings.DndModeDisplaySettingsActivity

import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
@@ -62,8 +61,6 @@ open class ZenModeDndDisplayScreen : 


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



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



    override fun isAvailable(context: Context) = context.hasDndMode()



    override fun getSummary(context: Context): CharSequence? {

src/com/android/settings/notification/modes/devicestate/ZenModeDndScreen.kt

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.settings.SettingsEnums 
import android.content.Context

import android.content.Intent

import android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID

import com.android.settings.CatalystFragment

import com.android.settings.R

import com.android.settings.Settings.ModeSettingsActivity

import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN
@@ -57,8 +56,6 @@ open class ZenModeDndScreen : 


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



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



    override fun isAvailable(context: Context) = context.hasDndMode()



    override fun getTitle(context: Context): CharSequence? = context.getDndMode()?.name

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

+2 −2
Original line number Diff line number Diff line
@@ -17,16 +17,16 @@ 
package com.android.settings.accessibility



import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settingslib.preference.CatalystScreenTestCase

import com.android.settingslib.preference.PreferenceScreenCreator

import com.google.common.truth.Truth.assertThat

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(AndroidJUnit4::class)

class ColorAndMotionScreenTest : CatalystScreenTestCase() {

    override val preferenceScreenCreator: PreferenceScreenCreator = ColorAndMotionScreen()

    override val preferenceScreenCreator: PreferenceScreenMixin = ColorAndMotionScreen()



    override val flagName: String

        get() = Flags.FLAG_CATALYST_ACCESSIBILITY_COLOR_AND_MOTION