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

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

Merge changes from topics "caitlinshk-navbar-interface",... 

Merge changes from topics "caitlinshk-navbar-interface", "caitlinshk-navbarcontrollerimpl" into main

* changes:
  [CS] 2/2: Define interface for NavigationBarController.
  [CS] 1/2: Rename NavBarController to NavBarControllerImpl.
parents 5ffe1e3e 25f99902

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.dock.DockManager; 
import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.media.dagger.MediaModule;

import com.android.systemui.navigationbar.NavigationBarControllerModule;

import com.android.systemui.navigationbar.gestural.GestureModule;

import com.android.systemui.plugins.qs.QSFactory;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -101,6 +102,7 @@ import javax.inject.Named; 
        GestureModule.class,

        MediaModule.class,

        MultiUserUtilsModule.class,

        NavigationBarControllerModule.class,

        PowerModule.class,

        QSModule.class,

        ReferenceScreenshotModule.class,

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+22 −447

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt

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

 * Copyright (C) 2023 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.navigationbar



import com.android.internal.statusbar.RegisterStatusBarResult

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.phone.BarTransitions

import javax.inject.Inject



/** A no-op version of [NavigationBarController] for variants like Arc and TV. */

@SysUISingleton

class NavigationBarControllerEmptyImpl @Inject constructor() : NavigationBarController {

    override fun createNavigationBars(

        includeDefaultDisplay: Boolean,

        result: RegisterStatusBarResult?,

    ) {}

    override fun removeNavigationBar(displayId: Int) {}

    override fun checkNavBarModes(displayId: Int) {}

    override fun finishBarAnimations(displayId: Int) {}

    override fun touchAutoDim(displayId: Int) {}

    override fun transitionTo(

        displayId: Int,

        @BarTransitions.TransitionMode barMode: Int,

        animate: Boolean,

    ) {}

    override fun disableAnimationsDuringHide(displayId: Int, delay: Long) {}

    override fun getDefaultNavigationBarView(): NavigationBarView? = null

    override fun getNavigationBarView(displayId: Int): NavigationBarView? = null

    override fun isOverviewEnabled(displayId: Int) = false

    override fun getDefaultNavigationBar(): NavigationBar? = null

}

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java

0 → 100644
+490 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerModule.kt

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

 * Copyright (C) 2023 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.navigationbar



import dagger.Binds

import dagger.Module



/** A module providing an instance of [NavigationBarController]. */

@Module

abstract class NavigationBarControllerModule {

    @Binds

    abstract fun navigationBarController(impl: NavigationBarControllerImpl): NavigationBarController

}