Revert "Moving taskbar lifecycle to TouchInteractionService"

This reverts commit e215fb730b.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I13700009003387451&testResultId=TR89423459137251402, bug https://buganizer.corp.google.com/issues/188755902

Bug: 188755902
Change-Id: I4650136975b60f311499ee6ff5b27ab9a32d23d6
This commit is contained in:
Kholoud Mohamed authored and kholoud mohamed committed 2021-05-20 13:32:05 +01:00
1 parent bb6f6e5dae
commit 430465a3d5
29 files changed
+981 -947

No files matched your search

@@ -16,17 +16,12 @@
package com.android.launcher3.taskbar;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_IME_SWITCH;
import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_RECENTS;
import android.annotation.DrawableRes;
import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import com.android.launcher3.R;
import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
/**
* Creates Buttons for Taskbar for 3 button nav.
@@ -34,46 +29,47 @@ import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarButton;
*/
public class ButtonProvider {
private final int mMarginLeftRight;
private final TaskbarActivityContext mContext;
private int mMarginLeftRight;
private final Context mContext;
public ButtonProvider(TaskbarActivityContext context) {
public ButtonProvider(Context context) {
mContext = context;
mMarginLeftRight = context.getResources()
.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
}
public void setMarginLeftRight(int margin) {
mMarginLeftRight = margin;
}
public View getBack() {
// Back button
return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
return getButtonForDrawable(R.drawable.ic_sysbar_back);
}
public View getDown() {
// Ime down button
return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
return getButtonForDrawable(R.drawable.ic_sysbar_back);
}
public View getHome() {
// Home button
return getButtonForDrawable(R.drawable.ic_sysbar_home, BUTTON_HOME);
return getButtonForDrawable(R.drawable.ic_sysbar_home);
}
public View getRecents() {
// Recents button
return getButtonForDrawable(R.drawable.ic_sysbar_recent, BUTTON_RECENTS);
return getButtonForDrawable(R.drawable.ic_sysbar_recent);
}
public View getImeSwitcher() {
// IME Switcher Button
return getButtonForDrawable(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH);
return getButtonForDrawable(R.drawable.ic_ime_switcher);
}
private View getButtonForDrawable(@DrawableRes int drawableId, @TaskbarButton int buttonType) {
private View getButtonForDrawable(@DrawableRes int drawableId) {
ImageView buttonView = new ImageView(mContext);
buttonView.setImageResource(drawableId);
buttonView.setBackgroundResource(R.drawable.taskbar_icon_click_feedback_roundrect);
buttonView.setPadding(mMarginLeftRight, 0, mMarginLeftRight, 0);
buttonView.setOnClickListener(view -> mContext.onNavigationButtonClick(buttonType));
return buttonView;
}