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

Commit 16c1f32b authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Clipboard accessibility fixes" into tm-dev am: 2e16265e 

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



Change-Id: I185893b1ae5dbf798467e8971b0ce6de7cc5a6cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c1f3946 2e16265e

packages/SystemUI/res/layout/clipboard_edit_text_activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
            android:id="@+id/edit_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="48dp"

            android:background="@null"

            android:gravity="start|top"

            android:textSize="24sp" />

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2485,7 +2485,7 @@ 
    <!-- Text informing user where text being edited was copied from [CHAR LIMIT=NONE] -->

    <string name="clipboard_edit_source">From <xliff:g id="appName" example="Gmail">%1$s</xliff:g></string>

    <!-- Label for button to dismiss clipboard overlay [CHAR LIMIT=NONE] -->

    <string name="clipboard_dismiss_description">Dismiss copy UI</string>

    <string name="clipboard_dismiss_description">Dismiss copied text</string>

    <!-- Label for button to edit text that was copied to the clipboard [CHAR LIMIT=NONE] -->

    <string name="clipboard_edit_text_description">Edit copied text</string>

    <!-- Label for button to edit an image that was copied to the clipboard [CHAR LIMIT=NONE] -->