openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Use nullable field and boolean rather than optional" into sc-dev

This commit is contained in:
Cyrus Boadway 2021-07-01 16:57:24 +00:00 committed by Android (Google) Code Review
parent 9010e773e4 551b4297ed
commit 048a858575
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
View File

@ -57,7 +57,6 @@ import com.android.launcher3.views.BaseDragLayer.TouchCompleteListener;
import com.android.launcher3.widget.dragndrop.AppWidgetHostViewDragListener;
import java.util.List;
import java.util.Optional;
/**
* {@inheritDoc}
@ -118,7 +117,8 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
private final ViewGroupFocusHelper mDragLayerRelativeCoordinateHelper;
private long mDeferUpdatesUntilMillis = 0;
private RemoteViews mDeferredRemoteViews;
private Optional<SparseIntArray> mDeferredColorChange = Optional.empty();
private boolean mHasDeferredColorChange = false;
private @Nullable SparseIntArray mDeferredColorChange = null;
private boolean mEnableColorExtraction = true;
public LauncherAppWidgetHostView(Context context) {
@ -244,18 +244,23 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
*/
public void endDeferringUpdates() {
RemoteViews remoteViews;
Optional<SparseIntArray> deferredColors;
SparseIntArray deferredColors;
boolean hasDeferredColors;
synchronized (mUpdateLock) {
mDeferUpdatesUntilMillis = 0;
remoteViews = mDeferredRemoteViews;
mDeferredRemoteViews = null;
deferredColors = mDeferredColorChange;
mDeferredColorChange = Optional.empty();
hasDeferredColors = mHasDeferredColorChange;
mDeferredColorChange = null;
mHasDeferredColorChange = false;
}
if (remoteViews != null) {
updateAppWidget(remoteViews);
}
deferredColors.ifPresent(colors -> onColorsChanged(null /* rectF */, colors));
if (hasDeferredColors) {
onColorsChanged(null /* rectF */, deferredColors);
}
}
public boolean onInterceptTouchEvent(MotionEvent ev) {
@ -437,10 +442,12 @@ public class LauncherAppWidgetHostView extends NavigableAppWidgetHostView
public void onColorsChanged(RectF rectF, SparseIntArray colors) {
synchronized (mUpdateLock) {
if (isDeferringUpdates()) {
mDeferredColorChange = Optional.ofNullable(colors);
mDeferredColorChange = colors;
mHasDeferredColorChange = true;
return;
}
mDeferredColorChange = Optional.empty();
mDeferredColorChange = null;
mHasDeferredColorChange = false;
}
// setColorResources will reapply the view, which must happen in the UI thread.