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

Commit ed3efcc7 authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Remove usages of enableTaskbarNavbarUnification()" into main

parents 15621fc4 2165747c

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

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.navigationbar; 


import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE_TAG;

import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;

import static com.android.wm.shell.Flags.enableTaskbarNavbarUnification;

import static com.android.wm.shell.Flags.enableTaskbarOnPhones;



import android.content.Context;
@@ -292,7 +291,7 @@ public class NavigationBarControllerImpl implements 
        // Enable for tablets, unfolded state on a foldable device, (non handheld AND flag is set),

        // or handheld when enableTaskbarOnPhones() returns true.

        boolean foldedOrPhone = !mIsPhone || enableTaskbarOnPhones();

        return mIsLargeScreen || (foldedOrPhone && enableTaskbarNavbarUnification());

        return mIsLargeScreen || foldedOrPhone;

    }



    // TODO: b/408503553 - Remove system decor callbacks once the flag is cleaned up.

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerImplTest.java

+2 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.Display.INVALID_DISPLAY;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;

import static com.android.wm.shell.Flags.enableTaskbarNavbarUnification;

import static com.android.wm.shell.Flags.enableTaskbarOnPhones;



import static org.junit.Assert.assertFalse;
@@ -159,7 +158,7 @@ public class NavigationBarControllerImplTest extends SysuiTestCase { 


    @Test

    public void testCreateNavigationBarsIncludeDefaultTrue() {

        assumeFalse(enableTaskbarNavbarUnification() && enableTaskbarOnPhones());

        assumeFalse(enableTaskbarOnPhones());



        // Large screens may be using taskbar and the logic is different

        mNavigationBarController.mIsLargeScreen = false;
@@ -318,7 +317,7 @@ public class NavigationBarControllerImplTest extends SysuiTestCase { 


    @Test

    public void testShouldRenderTaskbar_taskbarRenderedOnPhone() {

        assumeTrue(enableTaskbarNavbarUnification() && enableTaskbarOnPhones());

        assumeTrue(enableTaskbarOnPhones());



        mNavigationBarController.mIsLargeScreen = false;

        mNavigationBarController.mIsPhone = true;
@@ -334,8 +333,6 @@ public class NavigationBarControllerImplTest extends SysuiTestCase { 


    @Test

    public void testShouldRenderTaskbar_taskbarRenderedInFoldedState() {

        assumeTrue(enableTaskbarNavbarUnification());



        mNavigationBarController.mIsLargeScreen = false;

        mNavigationBarController.mIsPhone = false;

        assertTrue(mNavigationBarController.supportsTaskbar());