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

Commit 4145ef90 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Explicitly specify return type for fragmentClass()" into main

parents d3b6bf5f 9218b860

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

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.accessibility 
import android.app.settings.SettingsEnums

import android.content.Context

import android.hardware.display.ColorDisplayManager

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.Settings.ColorAndMotionActivity

import com.android.settings.core.PreferenceScreenMixin
@@ -51,7 +52,7 @@ open class ColorAndMotionScreen : PreferenceScreenMixin { 


    override fun hasCompleteHierarchy(): Boolean = true



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

    override fun fragmentClass(): Class<out Fragment>? = ColorAndMotionFragment::class.java



    override fun getPreferenceHierarchy(context: Context): PreferenceHierarchy {

        // LINT.IfChange(ui_hierarchy)

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 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.core.PreferenceScreenMixin

import com.android.settings.flags.Flags
@@ -37,7 +38,7 @@ open class TextReadingScreen : PreferenceScreenMixin { 


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



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

    override fun fragmentClass(): Class<out Fragment>? = TextReadingPreferenceFragment::class.java



    override fun getPreferenceHierarchy(context: Context) =

        preferenceHierarchy(context, this) {

src/com/android/settings/connecteddevice/BluetoothDashboardScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.connecteddevice 


import android.app.settings.SettingsEnums

import android.content.Context

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.Settings.BluetoothDashboardActivity

import com.android.settings.core.PreferenceScreenMixin
@@ -46,7 +47,7 @@ open class BluetoothDashboardScreen : PreferenceScreenMixin { 


    override fun hasCompleteHierarchy() = false



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

    override fun fragmentClass(): Class<out Fragment>? = BluetoothDashboardFragment::class.java



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

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

src/com/android/settings/datausage/DataSaverScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.datausage 
import android.app.settings.SettingsEnums

import android.content.Context

import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.Settings.DataSaverSummaryActivity

import com.android.settings.core.PreferenceScreenMixin
@@ -75,7 +76,7 @@ open class DataSaverScreen(context: Context) : 


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



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

    override fun fragmentClass(): Class<out Fragment>? = DataSaverSummary::class.java



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

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

src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context 
import android.content.Intent

import android.os.Build

import android.provider.Settings

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.Settings.MyDeviceInfoActivity

import com.android.settings.core.PreferenceScreenMixin
@@ -65,7 +66,7 @@ open class MyDeviceInfoScreen : 


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



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

    override fun fragmentClass(): Class<out Fragment>? = MyDeviceInfoFragment::class.java



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

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