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

Commit e5231d33 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I342a7c04,I0acfe08c,Iabcd610b into main 

* changes:
  [sb] status_bar_simple_fragment flag
  [sb] remove unused element from StatusBarFragmentModule
  [sb] remove unused param from initializer callback
parents 01f10fdf a68d9d8c

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -554,6 +554,13 @@ flag { 
    }

}



flag {

    name: "status_bar_simple_fragment"

    namespace: "systemui"

    description: "Feature flag for refactoring the collapsed status bar fragment"

    bug: "364360986"

}



flag {

    name: "new_volume_panel"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import com.android.systemui.res.R 
import com.android.systemui.statusbar.core.StatusBarInitializer.OnStatusBarViewInitializedListener

import com.android.systemui.statusbar.core.StatusBarInitializer.OnStatusBarViewUpdatedListener

import com.android.systemui.statusbar.phone.PhoneStatusBarTransitions

import com.android.systemui.statusbar.phone.PhoneStatusBarView

import com.android.systemui.statusbar.phone.PhoneStatusBarViewController

import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment

import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentComponent
@@ -60,7 +59,6 @@ interface StatusBarInitializer { 


    interface OnStatusBarViewUpdatedListener {

        fun onStatusBarViewUpdated(

            statusBarView: PhoneStatusBarView,

            statusBarViewController: PhoneStatusBarViewController,

            statusBarTransitions: PhoneStatusBarTransitions,

        )
@@ -88,7 +86,6 @@ constructor( 
                            (fragment as CollapsedStatusBarFragment).statusBarFragmentComponent

                                ?: throw IllegalStateException()

                        statusBarViewUpdatedListener?.onStatusBarViewUpdated(

                            statusBarFragmentComponent.phoneStatusBarView,

                            statusBarFragmentComponent.phoneStatusBarViewController,

                            statusBarFragmentComponent.phoneStatusBarTransitions,

                        )

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarSimpleFragment.kt

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

 * Copyright (C) 2024 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.core



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading and using the status bar simple fragment flag state */

object StatusBarSimpleFragment {

    /** Aconfig flag for removing the fragment */

    const val FLAG_NAME = Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.statusBarSimpleFragment()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

        RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is not enabled to ensure that the refactor author catches issues in testing.

     * Caution!! Using this check incorrectly will cause crashes in nextfood builds!

     */

    @JvmStatic

    inline fun assertInNewMode() = RefactorFlagUtils.assertInNewMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −3
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


    private final Point mCurrentDisplaySize = new Point();



    protected PhoneStatusBarView mStatusBarView;

    private PhoneStatusBarViewController mPhoneStatusBarViewController;

    private PhoneStatusBarTransitions mStatusBarTransitions;

    private final AuthRippleController mAuthRippleController;
@@ -1191,8 +1190,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


        // Set up CollapsedStatusBarFragment and PhoneStatusBarView

        mStatusBarInitializer.setStatusBarViewUpdatedListener(

                (statusBarView, statusBarViewController, statusBarTransitions) -> {

                    mStatusBarView = statusBarView;

                (statusBarViewController, statusBarTransitions) -> {

                    mPhoneStatusBarViewController = statusBarViewController;

                    mStatusBarTransitions = statusBarTransitions;

                    getNotificationShadeWindowViewController()

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/dagger/StatusBarFragmentModule.java

+0 −9
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.statusbar.phone.PhoneStatusBarTransitions; 
import com.android.systemui.statusbar.phone.PhoneStatusBarView;

import com.android.systemui.statusbar.phone.PhoneStatusBarViewController;

import com.android.systemui.statusbar.phone.StatusBarLocation;

import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherContainer;

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

import com.android.systemui.statusbar.window.StatusBarWindowController;
@@ -111,14 +110,6 @@ public interface StatusBarFragmentModule { 
        return view.findViewById(R.id.clock);

    }



    /** */

    @Provides

    @StatusBarFragmentScope

    static StatusBarUserSwitcherContainer provideStatusBarUserSwitcherContainer(

            @RootView PhoneStatusBarView view) {

        return view.findViewById(R.id.user_switcher_container);

    }



    /** */

    @Provides

    @StatusBarFragmentScope