diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-17 23:55:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-17 23:55:24 +0000 |
| commit | 1ba4ee89bed937514261bd50e8b501c72c380eab (patch) | |
| tree | b99ab9f80943c4ddc3c5f144f48426969668b834 /quickstep | |
| parent | a937981b87392e6e483ba08d2fb342257d54a6be (diff) | |
| parent | 9acafc228b3147086a3008c6e478ef3872ba089a (diff) | |
| download | android_packages_apps_Trebuchet-1ba4ee89bed937514261bd50e8b501c72c380eab.tar.gz android_packages_apps_Trebuchet-1ba4ee89bed937514261bd50e8b501c72c380eab.tar.bz2 android_packages_apps_Trebuchet-1ba4ee89bed937514261bd50e8b501c72c380eab.zip | |
Merge "Modifying SystemShortcut to enable support for RemoteAction" into ub-launcher3-master
Diffstat (limited to 'quickstep')
3 files changed, 5 insertions, 6 deletions
diff --git a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java index e64d04afd..66ce4c3ac 100644 --- a/quickstep/src/com/android/quickstep/TaskSystemShortcut.java +++ b/quickstep/src/com/android/quickstep/TaskSystemShortcut.java @@ -64,7 +64,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut protected T mSystemShortcut; protected TaskSystemShortcut(T systemShortcut) { - super(systemShortcut.iconResId, systemShortcut.labelResId); + super(systemShortcut); mSystemShortcut = systemShortcut; } diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java index 28928a8e5..c4afad7c9 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java +++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java @@ -208,8 +208,8 @@ public class TaskMenuView extends AbstractFloatingView { private void addMenuOption(TaskSystemShortcut menuOption, OnClickListener onClickListener) { ViewGroup menuOptionView = (ViewGroup) mActivity.getLayoutInflater().inflate( R.layout.task_view_menu_option, this, false); - menuOptionView.findViewById(R.id.icon).setBackgroundResource(menuOption.iconResId); - ((TextView) menuOptionView.findViewById(R.id.text)).setText(menuOption.labelResId); + menuOption.setIconAndLabelFor( + menuOptionView.findViewById(R.id.icon), menuOptionView.findViewById(R.id.text)); menuOptionView.setOnClickListener(onClickListener); mOptionLayout.addView(menuOptionView); } diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index a0615f502..c1424c475 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -387,8 +387,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback for (TaskSystemShortcut menuOption : TaskMenuView.MENU_OPTIONS) { OnClickListener onClickListener = menuOption.getOnClickListener(activity, this); if (onClickListener != null) { - info.addAction(new AccessibilityNodeInfo.AccessibilityAction(menuOption.labelResId, - context.getText(menuOption.labelResId))); + info.addAction(menuOption.createAccessibilityAction(context)); } } @@ -409,7 +408,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback } for (TaskSystemShortcut menuOption : TaskMenuView.MENU_OPTIONS) { - if (action == menuOption.labelResId) { + if (menuOption.hasHandlerForAction(action)) { OnClickListener onClickListener = menuOption.getOnClickListener( fromContext(getContext()), this); if (onClickListener != null) { |