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

Commit 291a7046 authored by Darryl Johnson's avatar Darryl Johnson Committed by Android (Google) Code Review
Browse files

Merge "Expose nav bar methods for extending" into sc-dev

parents 690e8880 f55a4adc

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

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    /** Only for default display */

    @Nullable

    private AssistHandleViewController mAssistHandlerViewController;

    AssistHandleViewController mAssistHandlerViewController;





    private final AutoHideUiElement mAutoHideUiElement = new AutoHideUiElement() {
@@ -1381,7 +1381,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        return true;

    }



    private void updateAccessibilityServicesState(AccessibilityManager accessibilityManager) {

    void updateAccessibilityServicesState(AccessibilityManager accessibilityManager) {

        if (mNavigationBarView == null) {

            return;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ public class NavigationBarController implements Callbacks, 
        });

    }



    private void removeNavigationBar(int displayId) {

    void removeNavigationBar(int displayId) {

        NavigationBar navBar = mNavigationBars.get(displayId);

        if (navBar != null) {

            navBar.setAutoHideController(/* autoHideController */ null);

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

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ import com.android.systemui.R; 
import com.android.systemui.navigationbar.buttons.ButtonDispatcher;

import com.android.systemui.navigationbar.buttons.KeyButtonView;

import com.android.systemui.navigationbar.buttons.ReverseLinearLayout;

import com.android.systemui.navigationbar.buttons.ReverseLinearLayout.ReverseRelativeLayout;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.navigationbar.buttons.ReverseLinearLayout.ReverseRelativeLayout;



import java.io.PrintWriter;

import java.util.Objects;
@@ -361,7 +361,7 @@ public class NavigationBarInflaterView extends FrameLayout 
        return v;

    }



    private View createView(String buttonSpec, ViewGroup parent, LayoutInflater inflater) {

    View createView(String buttonSpec, ViewGroup parent, LayoutInflater inflater) {

        View v = null;

        String button = extractButton(buttonSpec);

        if (LEFT.equals(button)) {