Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2669f6c9 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Remove text spans from clipboard UI" into udc-dev am: 0c9d6546 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22352002



Change-Id: Ic42f39c4d80ef7f5ae2d0ee09e2bb17eccc8d6a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65bc9a98 0c9d6546

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+2 −2
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
                if (model.isSensitive()) {

                    mView.showTextPreview(mContext.getString(R.string.clipboard_asterisks), true);

                } else {

                    mView.showTextPreview(model.getText(), false);

                    mView.showTextPreview(model.getText().toString(), false);

                }

                mView.setEditAccessibilityAction(true);

                mOnPreviewTapped = this::editText;
@@ -527,7 +527,7 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv 
    }



    private void showEditableText(CharSequence text, boolean hidden) {

        mView.showTextPreview(text, hidden);

        mView.showTextPreview(text.toString(), hidden);

        mView.setEditAccessibilityAction(true);

        mOnPreviewTapped = this::editText;

    }