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

Commit cd2880e4 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Deletes LifecycleActivity. 

LifecycleActivity seems to only be adding a Lifecycle to the framework
Activity class. The Jetpack ComponentActivity already does that and is
actively getting fixes whereas the Activity class is not.

This CL deletes LifecycleActivity and migrates existing subclasses to
subclass ComponentActivity from Jetpack, instead.

Bug: 243558484
Test: Opened and played with the home controls screens and the user
switcher screen. Did not test Wallet, but I have high
confidence that this change is safe given its nature and the manual test
for home controls.

Change-Id: I10f83c71d02e7218a0196b272006dbe6d17156dc
parent dda6807d

packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.ViewGroup 
import android.view.ViewStub

import android.widget.Button

import android.widget.TextView

import androidx.activity.ComponentActivity

import androidx.recyclerview.widget.GridLayoutManager

import androidx.recyclerview.widget.ItemTouchHelper

import androidx.recyclerview.widget.RecyclerView
@@ -36,7 +37,6 @@ import com.android.systemui.controls.controller.StructureInfo 
import com.android.systemui.controls.ui.ControlsActivity

import com.android.systemui.controls.ui.ControlsUiController

import com.android.systemui.settings.CurrentUserTracker

import com.android.systemui.util.LifecycleActivity

import javax.inject.Inject



/**
@@ -47,7 +47,7 @@ class ControlsEditingActivity @Inject constructor( 
    private val broadcastDispatcher: BroadcastDispatcher,

    private val customIconCache: CustomIconCache,

    private val uiController: ControlsUiController

) : LifecycleActivity() {

) : ComponentActivity() {



    companion object {

        private const val TAG = "ControlsEditingActivity"

packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.widget.Button 
import android.widget.FrameLayout

import android.widget.TextView

import android.widget.Toast

import androidx.activity.ComponentActivity

import androidx.viewpager2.widget.ViewPager2

import com.android.systemui.Prefs

import com.android.systemui.R
@@ -44,7 +45,6 @@ import com.android.systemui.controls.ui.ControlsActivity 
import com.android.systemui.controls.ui.ControlsUiController

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.settings.CurrentUserTracker

import com.android.systemui.util.LifecycleActivity

import java.text.Collator

import java.util.concurrent.Executor

import java.util.function.Consumer
@@ -56,7 +56,7 @@ class ControlsFavoritingActivity @Inject constructor( 
    private val listingController: ControlsListingController,

    private val broadcastDispatcher: BroadcastDispatcher,

    private val uiController: ControlsUiController

) : LifecycleActivity() {

) : ComponentActivity() {



    companion object {

        private const val TAG = "ControlsFavoritingActivity"

packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.view.ViewGroup 
import android.view.ViewStub

import android.widget.Button

import android.widget.TextView

import androidx.activity.ComponentActivity

import androidx.recyclerview.widget.LinearLayoutManager

import androidx.recyclerview.widget.RecyclerView

import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
@@ -37,7 +38,6 @@ import com.android.systemui.controls.ui.ControlsUiController 
import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.settings.CurrentUserTracker

import com.android.systemui.util.LifecycleActivity

import java.util.concurrent.Executor

import javax.inject.Inject
@@ -51,7 +51,7 @@ class ControlsProviderSelectorActivity @Inject constructor( 
    private val controlsController: ControlsController,

    private val broadcastDispatcher: BroadcastDispatcher,

    private val uiController: ControlsUiController

) : LifecycleActivity() {

) : ComponentActivity() {



    companion object {

        private const val TAG = "ControlsProviderSelectorActivity"

packages/SystemUI/src/com/android/systemui/controls/management/ControlsRequestDialog.kt

+2 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.LayoutInflater 
import android.view.View

import android.widget.ImageView

import android.widget.TextView

import androidx.activity.ComponentActivity

import com.android.systemui.R

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.controls.ControlsServiceInfo
@@ -38,14 +39,13 @@ import com.android.systemui.controls.controller.ControlsController 
import com.android.systemui.controls.ui.RenderInfo

import com.android.systemui.settings.CurrentUserTracker

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.util.LifecycleActivity

import javax.inject.Inject



open class ControlsRequestDialog @Inject constructor(

    private val controller: ControlsController,

    private val broadcastDispatcher: BroadcastDispatcher,

    private val controlsListingController: ControlsListingController

) : LifecycleActivity(), DialogInterface.OnClickListener, DialogInterface.OnCancelListener {

) : ComponentActivity(), DialogInterface.OnClickListener, DialogInterface.OnCancelListener {



    companion object {

        private const val TAG = "ControlsRequestDialog"

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt

+2 −3
Original line number Diff line number Diff line
@@ -25,11 +25,10 @@ import android.view.View 
import android.view.ViewGroup

import android.view.WindowInsets

import android.view.WindowInsets.Type



import androidx.activity.ComponentActivity

import com.android.systemui.R

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.controls.management.ControlsAnimations

import com.android.systemui.util.LifecycleActivity

import javax.inject.Inject



/**
@@ -42,7 +41,7 @@ import javax.inject.Inject 
class ControlsActivity @Inject constructor(

    private val uiController: ControlsUiController,

    private val broadcastDispatcher: BroadcastDispatcher

) : LifecycleActivity() {

) : ComponentActivity() {



    private lateinit var parent: ViewGroup

    private lateinit var broadcastReceiver: BroadcastReceiver