Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove obsolete edit chip in clipboard UI" into tm-qpr-dev

Browse Source
This commit is contained in:
Matt Casey
2023-02-15 00:57:28 +00:00
committed by Android (Google) Code Review
parent d6819393d2 6688355d14
commit 60694e36d8
4 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
View File

@@ -572,13 +572,6 @@ public final class SystemUiDeviceConfigFlags {
*/
public static final String PERSISTS_WIDGET_PROVIDER_INFO = "persists_widget_provider_info";
/**
* (boolean) Whether the clipboard overlay shows an edit button (as opposed to requiring tapping
* the preview to send an edit intent).
*/
public static final String CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON =
"clipboard_overlay_show_edit_button";
/**
* (boolean) Whether to show smart chips (based on TextClassifier) in the clipboard overlay.
*/

2
packages/SystemUI/res/layout/clipboard_overlay.xml
View File

@@ -61,8 +61,6 @@
android:id="@+id/share_chip"/>
<include layout="@layout/overlay_action_chip"
android:id="@+id/remote_copy_chip"/>
<include layout="@layout/overlay_action_chip"
android:id="@+id/edit_chip"/>
</LinearLayout>
</HorizontalScrollView>
<View

19
packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
View File

@@ -19,7 +19,6 @@ package com.android.systemui.clipboardoverlay;
import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_ACTIONS;
import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON;
import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_SHOWN;
import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ACTION_TAPPED;
import static com.android.systemui.clipboardoverlay.ClipboardOverlayEvent.CLIPBOARD_OVERLAY_DISMISSED_OTHER;
@@ -103,7 +102,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
private Runnable mOnSessionCompleteListener;
private Runnable mOnRemoteCopyTapped;
private Runnable mOnShareTapped;
private Runnable mOnEditTapped;
private Runnable mOnPreviewTapped;
private InputMonitor mInputMonitor;
@@ -154,13 +152,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
}
}
@Override
public void onEditButtonTapped() {
if (mOnEditTapped != null) {
mOnEditTapped.run();
}
}
@Override
public void onRemoteCopyButtonTapped() {
if (mOnRemoteCopyTapped != null) {
@@ -523,11 +514,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
mView.showTextPreview(text, hidden);
mView.setEditAccessibilityAction(true);
mOnPreviewTapped = this::editText;
if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON, false)) {
mOnEditTapped = this::editText;
mView.showEditChip(mContext.getString(R.string.clipboard_edit_text_description));
}
}
private boolean tryShowEditableImage(Uri uri, boolean isSensitive) {
@@ -558,10 +544,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
} else {
mView.showDefaultTextPreview();
}
if (isEditableImage && DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_SYSTEMUI, CLIPBOARD_OVERLAY_SHOW_EDIT_BUTTON, false)) {
mView.showEditChip(mContext.getString(R.string.clipboard_edit_image_description));
}
return isEditableImage;
}
@@ -637,7 +619,6 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
private void reset() {
mOnRemoteCopyTapped = null;
mOnShareTapped = null;
mOnEditTapped = null;
mOnPreviewTapped = null;
mView.reset();
mTimeoutHandler.cancelTimeout();

16
packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayView.java
View File

@@ -70,8 +70,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
void onRemoteCopyButtonTapped();
void onEditButtonTapped();
void onShareButtonTapped();
void onPreviewTapped();
@@ -94,7 +92,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
private TextView mHiddenPreview;
private LinearLayout mMinimizedPreview;
private View mPreviewBorder;
private OverlayActionChip mEditChip;
private OverlayActionChip mShareChip;
private OverlayActionChip mRemoteCopyChip;
private View mActionContainerBackground;
@@ -126,18 +123,14 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
mTextPreview = requireViewById(R.id.text_preview);
mHiddenPreview = requireViewById(R.id.hidden_preview);
mMinimizedPreview = requireViewById(R.id.minimized_preview);
mEditChip = requireViewById(R.id.edit_chip);
mShareChip = requireViewById(R.id.share_chip);
mRemoteCopyChip = requireViewById(R.id.remote_copy_chip);
mDismissButton = requireViewById(R.id.dismiss_button);
mEditChip.setAlpha(1);
mShareChip.setAlpha(1);
mRemoteCopyChip.setAlpha(1);
mShareChip.setContentDescription(mContext.getString(com.android.internal.R.string.share));
mEditChip.setIcon(
Icon.createWithResource(mContext, R.drawable.ic_screenshot_edit), true);
mRemoteCopyChip.setIcon(
Icon.createWithResource(mContext, R.drawable.ic_baseline_devices_24), true);
mShareChip.setIcon(
@@ -159,7 +152,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
public void setCallbacks(SwipeDismissCallbacks callbacks) {
super.setCallbacks(callbacks);
ClipboardOverlayCallbacks clipboardCallbacks = (ClipboardOverlayCallbacks) callbacks;
mEditChip.setOnClickListener(v -> clipboardCallbacks.onEditButtonTapped());
mShareChip.setOnClickListener(v -> clipboardCallbacks.onShareButtonTapped());
mDismissButton.setOnClickListener(v -> clipboardCallbacks.onDismissButtonTapped());
mRemoteCopyChip.setOnClickListener(v -> clipboardCallbacks.onRemoteCopyButtonTapped());
@@ -259,7 +251,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
updateTextSize(text, textView);
}
});
mEditChip.setVisibility(View.GONE);
}
void showImagePreview(@Nullable Bitmap thumbnail) {
@@ -272,12 +263,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
}
}
void showEditChip(String contentDescription) {
mEditChip.setVisibility(View.VISIBLE);
mActionContainerBackground.setVisibility(View.VISIBLE);
mEditChip.setContentDescription(contentDescription);
}
void showShareChip() {
mShareChip.setVisibility(View.VISIBLE);
mActionContainerBackground.setVisibility(View.VISIBLE);
@@ -289,7 +274,6 @@ public class ClipboardOverlayView extends DraggableConstraintLayout {
mActionContainerBackground.setVisibility(View.GONE);
mDismissButton.setVisibility(View.GONE);
mShareChip.setVisibility(View.GONE);
mEditChip.setVisibility(View.GONE);
mRemoteCopyChip.setVisibility(View.GONE);
setEditAccessibilityAction(false);
resetActionChips();