Merge "Processing non-long clicks on application icon." into mnc-dev (c51c3f64) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/recents_task_view_header.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		android:layout_gravity="top\|center_horizontal">
		<com.android.systemui.recents.views.FixedSizeImageView
		android:id="@+id/application_icon"
		android:contentDescription="@string/recents_app_info_button_label"
		android:layout_width="@dimen/recents_task_view_application_icon_size"
		android:layout_height="@dimen/recents_task_view_application_icon_size"
		android:layout_marginStart="8dp"

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.animation.ValueAnimator;
		import android.content.Context;
		import android.graphics.*;
		import android.util.AttributeSet;
		import android.view.accessibility.AccessibilityManager;
		import android.view.View;
		import android.view.ViewOutlineProvider;
		import android.view.animation.AccelerateInterpolator;
		@@ -672,7 +673,11 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
		mThumbnailView.rebindToTask(mTask);
		mHeaderView.rebindToTask(mTask);
		// Rebind any listeners
		AccessibilityManager am = (AccessibilityManager) getContext().
		getSystemService(Context.ACCESSIBILITY_SERVICE);
		if (Constants.DebugFlags.App.EnableTaskFiltering \|\| (am != null && am.isEnabled())) {
		mHeaderView.mApplicationIcon.setOnClickListener(this);
		}
		mHeaderView.mDismissButton.setOnClickListener(this);
		if (mConfig.multiStackEnabled) {
		mHeaderView.mMoveTaskButton.setOnClickListener(this);
		@@ -718,10 +723,20 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
		postDelayed(new Runnable() {
		@Override
		public void run() {
		if (Constants.DebugFlags.App.EnableTaskFiltering && v == mHeaderView.mApplicationIcon) {
		if (v == mHeaderView.mApplicationIcon) {
		if (Constants.DebugFlags.App.EnableTaskFiltering) {
		if (mCb != null) {
		mCb.onTaskViewAppIconClicked(tv);
		}
		} else {
		AccessibilityManager am = (AccessibilityManager) getContext().
		getSystemService(Context.ACCESSIBILITY_SERVICE);
		if (am != null && am.isEnabled()) {
		if (mCb != null) {
		mCb.onTaskViewAppInfoClicked(tv);
		}
		}
		}
		} else if (v == mHeaderView.mDismissButton) {
		dismissTask();
		} else if (v == mHeaderView.mMoveTaskButton) {

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,6 @@ public class TaskViewHeader extends FrameLayout {
		} else if (t.applicationIcon != null) {
		mApplicationIcon.setImageDrawable(t.applicationIcon);
		}
		mApplicationIcon.setContentDescription(t.contentDescription);
		if (!mActivityDescription.getText().toString().equals(t.activityLabel)) {
		mActivityDescription.setText(t.activityLabel);
		}