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

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

Switching UserSwitcherController implementation. 

Introduces a class that implements UserSwitcherController by checking
the feature flags and delegating to the old implementation if the flag
is not set.

Right now, the class will throw an exception if the flag is set to on
because all of its methods are unimplemented. In the next CL(s), we will
be implementing all of these.

Bug: 246631653
Test: Ran system UI, did some user switching, verified no crashes.
Change-Id: Ia5df853c5297ba6a086db867ad39111ff6758b6d
parent 967590d1

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherControllerImpl.kt

0 → 100644
+269 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.statusbar.policy



import android.content.Intent

import android.view.View

import com.android.settingslib.RestrictedLockUtils

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.qs.user.UserSwitchDialogController

import com.android.systemui.user.data.source.UserRecord

import dagger.Lazy

import java.io.PrintWriter

import java.lang.ref.WeakReference

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow



/** Implementation of [UserSwitcherController]. */

class UserSwitcherControllerImpl

@Inject

constructor(

    private val flags: FeatureFlags,

    @Suppress("DEPRECATION") private val oldImpl: Lazy<UserSwitcherControllerOldImpl>,

) : UserSwitcherController {



    private val isNewImpl: Boolean

        get() = flags.isEnabled(Flags.REFACTORED_USER_SWITCHER_CONTROLLER)

    private val _oldImpl: UserSwitcherControllerOldImpl

        get() = oldImpl.get()



    private fun notYetImplemented(): Nothing {

        error("Not yet implemented!")

    }



    override val users: ArrayList<UserRecord>

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.users

            }



    override val isSimpleUserSwitcher: Boolean

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.isSimpleUserSwitcher

            }



    override fun init(view: View) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.init(view)

        }

    }



    override val currentUserRecord: UserRecord?

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.currentUserRecord

            }



    override val currentUserName: String?

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.currentUserName

            }



    override fun onUserSelected(

        userId: Int,

        dialogShower: UserSwitchDialogController.DialogShower?

    ) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.onUserSelected(userId, dialogShower)

        }

    }



    override val isAddUsersFromLockScreenEnabled: Flow<Boolean>

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.isAddUsersFromLockScreenEnabled

            }



    override val isGuestUserAutoCreated: Boolean

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.isGuestUserAutoCreated

            }



    override val isGuestUserResetting: Boolean

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.isGuestUserResetting

            }



    override fun createAndSwitchToGuestUser(

        dialogShower: UserSwitchDialogController.DialogShower?,

    ) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.createAndSwitchToGuestUser(dialogShower)

        }

    }



    override fun showAddUserDialog(dialogShower: UserSwitchDialogController.DialogShower?) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.showAddUserDialog(dialogShower)

        }

    }



    override fun startSupervisedUserActivity() {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.startSupervisedUserActivity()

        }

    }



    override fun onDensityOrFontScaleChanged() {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.onDensityOrFontScaleChanged()

        }

    }



    override fun addAdapter(adapter: WeakReference<BaseUserSwitcherAdapter>) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.addAdapter(adapter)

        }

    }



    override fun onUserListItemClicked(

        record: UserRecord,

        dialogShower: UserSwitchDialogController.DialogShower?,

    ) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.onUserListItemClicked(record, dialogShower)

        }

    }



    override fun removeGuestUser(guestUserId: Int, targetUserId: Int) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.removeGuestUser(guestUserId, targetUserId)

        }

    }



    override fun exitGuestUser(

        guestUserId: Int,

        targetUserId: Int,

        forceRemoveGuestOnExit: Boolean

    ) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.exitGuestUser(guestUserId, targetUserId, forceRemoveGuestOnExit)

        }

    }



    override fun schedulePostBootGuestCreation() {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.schedulePostBootGuestCreation()

        }

    }



    override val isKeyguardShowing: Boolean

        get() =

            if (isNewImpl) {

                notYetImplemented()

            } else {

                _oldImpl.isKeyguardShowing

            }



    override fun getEnforcedAdmin(record: UserRecord): RestrictedLockUtils.EnforcedAdmin? {

        return if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.getEnforcedAdmin(record)

        }

    }



    override fun isDisabledByAdmin(record: UserRecord): Boolean {

        return if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.isDisabledByAdmin(record)

        }

    }



    override fun startActivity(intent: Intent) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.startActivity(intent)

        }

    }



    override fun refreshUsers(forcePictureLoadForId: Int) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.refreshUsers(forcePictureLoadForId)

        }

    }



    override fun addUserSwitchCallback(callback: UserSwitcherController.UserSwitchCallback) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.addUserSwitchCallback(callback)

        }

    }



    override fun removeUserSwitchCallback(callback: UserSwitcherController.UserSwitchCallback) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.removeUserSwitchCallback(callback)

        }

    }



    override fun dump(pw: PrintWriter, args: Array<out String>) {

        if (isNewImpl) {

            notYetImplemented()

        } else {

            _oldImpl.dump(pw, args)

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/policy/dagger/StatusBarPolicyModule.java

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import com.android.systemui.statusbar.policy.SecurityControllerImpl; 
import com.android.systemui.statusbar.policy.UserInfoController;

import com.android.systemui.statusbar.policy.UserInfoControllerImpl;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.policy.UserSwitcherControllerOldImpl;

import com.android.systemui.statusbar.policy.UserSwitcherControllerImpl;

import com.android.systemui.statusbar.policy.WalletController;

import com.android.systemui.statusbar.policy.WalletControllerImpl;

import com.android.systemui.statusbar.policy.ZenModeController;
@@ -201,5 +201,5 @@ public interface StatusBarPolicyModule { 


    /** Binds {@link UserSwitcherController} to its implementation. */

    @Binds

    UserSwitcherController bindUserSwitcherController(UserSwitcherControllerOldImpl impl);

    UserSwitcherController bindUserSwitcherController(UserSwitcherControllerImpl impl);

}