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

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

Merge changes from topic "catalyst" into main 

* changes:
  [Catalyst] Implement PreferenceScreenMixin for SupervisionDashboardScreen
  [Catalyst] Add PreferenceScreenMixin.highlightMenuKey
parents 0ad45d0d b1d2cd87

src/com/android/settings/CatalystSettingsActivity.kt

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ constructor( 
 * Use [DashboardFragment] as base class instead of [PreferenceFragment] to support injection and

 * highlighting specific preference.

 */

class CatalystFragment : DashboardFragment() {

open class CatalystFragment : DashboardFragment() {



    override fun getPreferenceScreenResId() = 0
@@ -62,5 +62,6 @@ class CatalystFragment : DashboardFragment() { 


    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

        preferenceScreen = createPreferenceScreen()

        refreshDashboardTiles(logTag)

    }

}

src/com/android/settings/core/PreferenceScreenMixin.kt

+8 −1
Original line number Diff line number Diff line
@@ -16,8 +16,15 @@ 


package com.android.settings.core



import androidx.annotation.StringRes

import com.android.settingslib.core.instrumentation.Instrumentable

import com.android.settingslib.preference.PreferenceScreenCreator



/** Mixin for settings preference screen. */

interface PreferenceScreenMixin : PreferenceScreenCreator, Instrumentable
 
interface PreferenceScreenMixin : PreferenceScreenCreator, Instrumentable {



    /**

     * A string resource indicates the menu item that should be highlighted on settings home menu.

     */

    @get:StringRes val highlightMenuKey: Int

}

src/com/android/settings/dashboard/DashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
    /**

     * Refresh preference items backed by DashboardCategory.

     */

    private void refreshDashboardTiles(final String tag) {

    protected void refreshDashboardTiles(final String tag) {

        final PreferenceScreen screen = getPreferenceScreen();



        final DashboardCategory category =

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionScreen.kt

+8 −2
Original line number Diff line number Diff line
@@ -16,21 +16,22 @@ 


package com.android.settings.deviceinfo.firmwareversion



import android.app.settings.SettingsEnums

import android.content.Context

import android.os.Build

import com.android.settings.R

import com.android.settings.Settings.FirmwareVersionActivity

import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.PreferenceSummaryProvider

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator



@ProvidePreferenceScreen(FirmwareVersionScreen.KEY)

class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider {

open class FirmwareVersionScreen : PreferenceScreenMixin, PreferenceSummaryProvider {



    override fun tags(context: Context) = arrayOf(TAG_DEVICE_STATE_SCREEN)
@@ -51,6 +52,11 @@ class FirmwareVersionScreen : PreferenceScreenCreator, PreferenceSummaryProvider 
    // Once fully launch, change to PreferenceFragment and clean up FirmwareVersionScreenTest

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



    override fun getMetricsCategory() = SettingsEnums.DIALOG_FIRMWARE_VERSION



    override val highlightMenuKey: Int

        get() = R.string.menu_key_about_device



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

        makeLaunchIntent(context, FirmwareVersionActivity::class.java, metadata?.key)

src/com/android/settings/network/NetworkDashboardScreen.kt

+8 −2
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
 */

package com.android.settings.network



import android.app.settings.SettingsEnums.SETTINGS_NETWORK_CATEGORY

import android.content.Context

import com.android.settings.R

import com.android.settings.Settings.NetworkDashboardActivity

import com.android.settings.core.PreferenceScreenMixin

import com.android.settings.datausage.DataSaverScreen

import com.android.settings.flags.Flags

import com.android.settings.utils.makeLaunchIntent
@@ -25,11 +27,10 @@ import com.android.settingslib.metadata.PreferenceIconProvider 
import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.metadata.ProvidePreferenceScreen

import com.android.settingslib.metadata.preferenceHierarchy

import com.android.settingslib.preference.PreferenceScreenCreator

import com.android.settingslib.widget.SettingsThemeHelper.isExpressiveTheme



@ProvidePreferenceScreen(NetworkDashboardScreen.KEY)

class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider {

open class NetworkDashboardScreen : PreferenceScreenMixin, PreferenceIconProvider {

    override val key: String

        get() = KEY
@@ -49,6 +50,11 @@ class NetworkDashboardScreen : PreferenceScreenCreator, PreferenceIconProvider { 


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



    override fun getMetricsCategory() = SETTINGS_NETWORK_CATEGORY



    override val highlightMenuKey: Int

        get() = R.string.menu_key_network



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

        makeLaunchIntent(context, NetworkDashboardActivity::class.java, metadata?.key)