| commit | 90ebc3437de5115bf99f36960d27d5747119874a | [log] [tgz] |
|---|---|---|
| author | Sreyas Rangaraju <sreyasr@google.com> | Fri Feb 12 23:56:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 12 23:56:44 2021 +0000 |
| tree | 04f8c09a131b5a7fa6146281edbcfdb38b99bd9f | |
| parent | 68bd23f94884d0ca090eb48b9737d4f2826608c3 [diff] | |
| parent | 4e6a7e340d93519f5b01b85383f880a9f2e2bc25 [diff] |
Merge "Updated TaskMenuView." into sc-dev am: 4e6a7e340d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13556167 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I47e10ad43083c6637fedb87e471ad29618cf2903
diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml index 744a305..3916ff9 100644 --- a/quickstep/res/layout/task_menu.xml +++ b/quickstep/res/layout/task_menu.xml
@@ -29,6 +29,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" + android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:textSize="12sp"/>
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java index 7e558bb..e21bf76 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java +++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -24,7 +24,6 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Rect; -import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.Gravity; import android.view.MotionEvent; @@ -164,7 +163,6 @@ } private void addMenuOptions(TaskView taskView) { - Drawable icon = taskView.getTask().icon.getConstantState().newDrawable(); mTaskName.setText(TaskUtils.getTitle(getContext(), taskView.getTask())); mTaskName.setOnClickListener(v -> close(true));