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

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

Merge "Move AllAppsButton placement for desktop environment." into tm-qpr-dev

parents 39128081 fcb9cb76

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

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

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

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

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





import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.widget.FrameLayout;

import android.widget.FrameLayout;
@@ -31,6 +33,8 @@ public class DesktopNavbarButtonsViewController extends NavbarButtonsViewControl 
    private final TaskbarActivityContext mContext;

    private final TaskbarActivityContext mContext;

    private final FrameLayout mNavButtonsView;

    private final FrameLayout mNavButtonsView;

    private final ViewGroup mNavButtonContainer;

    private final ViewGroup mNavButtonContainer;

    private final ViewGroup mStartContextualContainer;

    private final View mAllAppsButton;





    private TaskbarControllers mControllers;

    private TaskbarControllers mControllers;
@@ -40,6 +44,12 @@ public class DesktopNavbarButtonsViewController extends NavbarButtonsViewControl 
        mContext = context;

        mContext = context;

        mNavButtonsView = navButtonsView;

        mNavButtonsView = navButtonsView;

        mNavButtonContainer = mNavButtonsView.findViewById(R.id.end_nav_buttons);

        mNavButtonContainer = mNavButtonsView.findViewById(R.id.end_nav_buttons);

        mStartContextualContainer = mNavButtonsView.findViewById(R.id.start_contextual_buttons);

        mAllAppsButton = LayoutInflater.from(context)

                .inflate(R.layout.taskbar_all_apps_button, mStartContextualContainer, false);

        mAllAppsButton.setOnClickListener((View v) -> {

            mControllers.taskbarAllAppsController.show();

        });

    }

    }





    /**

    /**
@@ -57,6 +67,8 @@ public class DesktopNavbarButtonsViewController extends NavbarButtonsViewControl 
        addButton(R.drawable.ic_sysbar_notifications, BUTTON_NOTIFICATIONS,

        addButton(R.drawable.ic_sysbar_notifications, BUTTON_NOTIFICATIONS,

                mNavButtonContainer, mControllers.navButtonController,

                mNavButtonContainer, mControllers.navButtonController,

                R.id.notifications_button);

                R.id.notifications_button);

        // All apps button

        mStartContextualContainer.addView(mAllAppsButton);

    }

    }





    /** Cleans up on destroy */

    /** Cleans up on destroy */

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.taskbar; 




import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.Rect;

import android.graphics.Rect;
@@ -126,6 +127,9 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
            mAllAppsButton = LayoutInflater.from(context)

            mAllAppsButton = LayoutInflater.from(context)

                    .inflate(R.layout.taskbar_all_apps_button, this, false);

                    .inflate(R.layout.taskbar_all_apps_button, this, false);

            mAllAppsButton.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding);

            mAllAppsButton.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding);

            if (mActivityContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC)) {

                mAllAppsButton.setVisibility(GONE);

            }

        }

        }





        // TODO: Disable touch events on QSB otherwise it can crash.

        // TODO: Disable touch events on QSB otherwise it can crash.