commit 08e41fdb9f0d747cd01a16debed958bad2b90c69
author Lin Guo <linguo@google.com> Fri Mar 03 03:27:11 2023 +0000
committer Lin Guo <linguo@google.com> Fri Mar 03 06:07:51 2023 +0000
tree f381e07753be1243458b1fc4356675596ad9ee7a
parent 34119ee5fb24f0b331252d3787acdb31314428f2

Fix textClear test

Bug: 271085711
Test: NA
Change-Id: I678f77077f2149c3eb77c395095eb6fe2933a1e8

emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt

diff --git a/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt b/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt
index 56ce7b8..dd4ff10 100644
--- a/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt
+++ b/emoji2/emoji2-emojipicker/src/androidTest/java/androidx/emoji2/emojipicker/EmojiViewTest.kt
@@ -31,7 +31,6 @@
 import androidx.test.screenshot.AndroidXScreenshotTestRule
 import androidx.test.screenshot.assertAgainstGolden
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -95,7 +94,6 @@
         dumpAndAssertAgainstGolden("multiple_draw")
     }
 
-    @Ignore // b/271085711
     @Test
     fun testClear() {
         setAndWait(GRINNING_FACE)

emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt

diff --git a/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt b/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt
index 22a477c..c242938 100644
--- a/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt
+++ b/emoji2/emoji2-emojipicker/src/main/java/androidx/emoji2/emojipicker/EmojiView.kt
@@ -92,8 +92,8 @@
     var emoji: CharSequence? = null
         set(value) {
             field = value
-            if (value != null) {
-                post {
+            post {
+                if (value != null) {
                     if (value == this.emoji) {
                         drawEmoji(
                             if (EmojiPickerView.emojiCompatLoaded)
@@ -104,9 +104,9 @@
                         contentDescription = value
                     }
                     invalidate()
+                } else {
+                    offscreenCanvasBitmap.eraseColor(Color.TRANSPARENT)
                 }
-            } else {
-                offscreenCanvasBitmap.eraseColor(Color.TRANSPARENT)
             }
         }