Revert^2 "Moving taskbar lifecycle to TouchInteractionService"
430465a3d5
Bug: 187353581
Change-Id: I7b2280d16adfafd3e85ffc1d22e32d0c00d12b67
This commit is contained in:
1 parent
fd3ad5d769
commit
d5500548dc
29 files changed
+948
-982
No files matched your search
@@ -16,12 +16,17 @@
|
||||
|
||||
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.
|
||||
@@ -29,47 +34,46 @@ import com.android.launcher3.R;
|
||||
*/
|
||||
public class ButtonProvider {
|
||||
|
||||
private int mMarginLeftRight;
|
||||
private final Context mContext;
|
||||
private final int mMarginLeftRight;
|
||||
private final TaskbarActivityContext mContext;
|
||||
|
||||
public ButtonProvider(Context context) {
|
||||
public ButtonProvider(TaskbarActivityContext context) {
|
||||
mContext = context;
|
||||
}
|
||||
|
||||
public void setMarginLeftRight(int margin) {
|
||||
mMarginLeftRight = margin;
|
||||
mMarginLeftRight = context.getResources()
|
||||
.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
|
||||
}
|
||||
|
||||
public View getBack() {
|
||||
// Back button
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_back);
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
|
||||
}
|
||||
|
||||
public View getDown() {
|
||||
// Ime down button
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_back);
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_back, BUTTON_BACK);
|
||||
}
|
||||
|
||||
public View getHome() {
|
||||
// Home button
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_home);
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_home, BUTTON_HOME);
|
||||
}
|
||||
|
||||
public View getRecents() {
|
||||
// Recents button
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_recent);
|
||||
return getButtonForDrawable(R.drawable.ic_sysbar_recent, BUTTON_RECENTS);
|
||||
}
|
||||
|
||||
public View getImeSwitcher() {
|
||||
// IME Switcher Button
|
||||
return getButtonForDrawable(R.drawable.ic_ime_switcher);
|
||||
return getButtonForDrawable(R.drawable.ic_ime_switcher, BUTTON_IME_SWITCH);
|
||||
}
|
||||
|
||||
private View getButtonForDrawable(@DrawableRes int drawableId) {
|
||||
private View getButtonForDrawable(@DrawableRes int drawableId, @TaskbarButton int buttonType) {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user