Merge "Fix taskbar instrumentation crash" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
98e4e461fe
@@ -49,8 +49,6 @@ import com.android.quickstep.AnimatedFloat;
|
|||||||
import com.android.quickstep.SystemUiProxy;
|
import com.android.quickstep.SystemUiProxy;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.StringJoiner;
|
import java.util.StringJoiner;
|
||||||
import java.util.function.IntPredicate;
|
import java.util.function.IntPredicate;
|
||||||
|
|
||||||
@@ -546,13 +544,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void addJankMonitorListener(AnimatorSet animator, boolean expanding) {
|
private void addJankMonitorListener(AnimatorSet animator, boolean expanding) {
|
||||||
Optional<View> optionalView =
|
View v = mControllers.taskbarActivityContext.getDragLayer();
|
||||||
Arrays.stream(mControllers.taskbarViewController.getIconViews()).findFirst();
|
|
||||||
if (optionalView.isEmpty()) {
|
|
||||||
Log.wtf(TAG, "No views to start Interaction jank monitor with.", new Exception());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
View v = optionalView.get();
|
|
||||||
int action = expanding ? InteractionJankMonitor.CUJ_TASKBAR_EXPAND :
|
int action = expanding ? InteractionJankMonitor.CUJ_TASKBAR_EXPAND :
|
||||||
InteractionJankMonitor.CUJ_TASKBAR_COLLAPSE;
|
InteractionJankMonitor.CUJ_TASKBAR_COLLAPSE;
|
||||||
animator.addListener(new AnimatorListenerAdapter() {
|
animator.addListener(new AnimatorListenerAdapter() {
|
||||||
|
|||||||
Reference in New Issue
Block a user