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

Commit b0b8e3a5 authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE from NavbarButtonsViewController on FEATURE_PC devices." into main

parents 04f5b767 a779330a

quickstep/src/com/android/launcher3/taskbar/DesktopNavbarButtonsViewController.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.taskbar; 
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_NOTIFICATIONS;

import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_QUICK_SETTINGS;



import android.content.pm.ActivityInfo.Config;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -56,6 +57,11 @@ public class DesktopNavbarButtonsViewController extends NavbarButtonsViewControl 
    @Override

    public void init(TaskbarControllers controllers) {

        mControllers = controllers;

        super.init(controllers);

    }



    @Override

    protected void setupController() {

        mNavButtonsView.getLayoutParams().height = mContext.getDeviceProfile().taskbarHeight;



        // Quick settings and notifications buttons
@@ -72,4 +78,7 @@ public class DesktopNavbarButtonsViewController extends NavbarButtonsViewControl 
    /** Cleans up on destroy */

    @Override

    public void onDestroy() { }



    @Override

    public void onConfigurationChanged(@Config int configChanges) { }

}

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+5 −1
Original line number Diff line number Diff line
@@ -219,11 +219,15 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
     */

    public void init(TaskbarControllers controllers) {

        mControllers = controllers;

        setupController();

    }



    protected void setupController() {

        boolean isThreeButtonNav = mContext.isThreeButtonNav();

        DeviceProfile deviceProfile = mContext.getDeviceProfile();

        Resources resources = mContext.getResources();

        Point p = !mContext.isUserSetupComplete()

                ? new Point(0, controllers.taskbarActivityContext.getSetupWindowHeight())

                ? new Point(0, mControllers.taskbarActivityContext.getSetupWindowHeight())

                : DimensionUtils.getTaskbarPhoneDimensions(deviceProfile, resources,

                        TaskbarManager.isPhoneMode(deviceProfile));

        mNavButtonsView.getLayoutParams().height = p.y;