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

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

Merge "[Catalyst] Migrate Modes > Bedtime > On/Off" into main

parents 6d4d2de3 4d7ef106

src/com/android/settings/appfunctions/DeviceStateConfig.kt

+5 −0
Original line number Diff line number Diff line
@@ -512,6 +512,11 @@ fun getDeviceStateItemList() = 
            settingKey = ZenModeButtonPreference.KEY,

            settingScreenKey = ZenModeDndScreen.KEY,

        ),

        DeviceStateItemConfig(

            enabled = true,

            settingKey = ZenModeButtonPreference.KEY,

            settingScreenKey = ZenModeBedtimeScreen.KEY,

        ),

        DeviceStateItemConfig(

            enabled = true,

            settingKey = AppInfoStorageScreen.KEY,

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

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ class ZenModeBedtimeScreen : 
                .putExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID, context.getBedtimeMode()?.id)

        else null



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

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

        +ZenModeButtonPreference(context.getBedtimeMode()!!)

    }



    companion object {

        const val KEY = "device_state_bedtime_mode_screen" // only for device state.

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

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.notification.modes.devicestate



import android.annotation.FlaggedApi

import android.app.Flags as AppFlags

import android.content.Context

import android.content.Intent
@@ -66,7 +65,6 @@ class ZenModeDndDisplayScreen : 
        return summaryHelper.getDisplayEffectsSummary(context.getDndMode()!!)

    }



    @FlaggedApi(AppFlags.FLAG_MODES_UI)

    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?): Intent? =

        if (AppFlags.modesUi()) {

            Intent(context, ModeDisplaySettingsActivity::class.java)

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

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.notification.modes.devicestate



import android.annotation.FlaggedApi

import android.app.Flags as AppFlags

import android.content.Context

import android.content.Intent
@@ -60,7 +59,6 @@ class ZenModeDndScreen : 
    override fun getSummary(context: Context): CharSequence? =

        context.getZenModeScreenSummary(context.getDndMode())



    @FlaggedApi(AppFlags.FLAG_MODES_UI)

    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?): Intent? =

        if (AppFlags.modesUi())

            Intent(context, ModeSettingsActivity::class.java)