PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Disabling overview actions when thumbnail is not loaded." into ub-launcher3-rvc-qpr-dev

Browse Source
This commit is contained in:
Sreyas Rangaraju
2020-07-15 23:31:51 +00:00
committed by Android (Google) Code Review
parent 0d2eea3316 68330a93fa
commit e1037c63dd
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
+20 -16
View File
@@ -19,6 +19,7 @@ package com.android.quickstep;
import static android.view.Surface.ROTATION_0;
import static com.android.launcher3.util.MainThreadInitializedObject.forOverride;
import static com.android.quickstep.views.OverviewActionsView.DISABLED_NO_THUMBNAIL;
import static com.android.quickstep.views.OverviewActionsView.DISABLED_ROTATED;
import android.annotation.SuppressLint;
@@ -146,26 +147,29 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
*/
public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
boolean rotated) {
final boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
if (thumbnail != null) {
getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
final boolean isAllowedByPolicy = thumbnail.isRealSnapshot;
getActionsView().setCallbacks(new OverlayUICallbacks() {
@Override
public void onShare() {
if (isAllowedByPolicy) {
mImageApi.startShareActivity();
} else {
showBlockedByPolicyMessage();
getActionsView().setCallbacks(new OverlayUICallbacks() {
@Override
public void onShare() {
if (isAllowedByPolicy) {
mImageApi.startShareActivity();
} else {
showBlockedByPolicyMessage();
}
}
}
@SuppressLint("NewApi")
@Override
public void onScreenshot() {
saveScreenshot(task);
}
});
@SuppressLint("NewApi")
@Override
public void onScreenshot() {
saveScreenshot(task);
}
});
}
}
/**
quickstep/recents_ui_overrides/src/com/android/quickstep/views/OverviewActionsView.java
+3 -1
View File
@@ -70,12 +70,14 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
@IntDef(flag = true, value = {
DISABLED_SCROLLING,
DISABLED_ROTATED})
DISABLED_ROTATED,
DISABLED_NO_THUMBNAIL})
@Retention(RetentionPolicy.SOURCE)
public @interface ActionsDisabledFlags { }
public static final int DISABLED_SCROLLING = 1 << 0;
public static final int DISABLED_ROTATED = 1 << 1;
public static final int DISABLED_NO_THUMBNAIL = 1 << 2;
private static final int INDEX_CONTENT_ALPHA = 0;
private static final int INDEX_VISIBILITY_ALPHA = 1;
quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
+1 -1
View File
@@ -357,7 +357,7 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
}
private void updateOverlay() {
if (mOverlayEnabled && mBitmapShader != null && mThumbnailData != null) {
if (mOverlayEnabled) {
mOverlay.initOverlay(mTask, mThumbnailData, mPreviewPositionHelper.mMatrix,
mPreviewPositionHelper.mIsOrientationChanged);
} else {