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

Commit 2c0db9ed authored by Andrew Cole's avatar Andrew Cole Committed by Automerger Merge Worker
Browse files

Merge "Updating isTextClippedVerticallyTest" into udc-dev am: 5929e8ae am: 66685841 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159150



Change-Id: I16fa3e8d78116d7d826930567634e6f611a5c1df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14734d3a 66685841

src/com/android/launcher3/ButtonDropTarget.java

+6 −0
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@ public abstract class ButtonDropTarget extends TextView 
        setContentDescription(mText);

    }



    protected void updateText(CharSequence text) {

        setText(text);

        mText = getText();

        setContentDescription(mText);

    }



    protected void setDrawable(int resId) {

        // We do not set the drawable in the xml as that inflates two drawables corresponding to

        // drawableLeft and drawableStart.

tests/src/com/android/launcher3/DeleteDropTargetTest.kt

+3 −8
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ import com.android.launcher3.Utilities.* 
import com.android.launcher3.util.ActivityContextWrapper

import com.google.common.truth.Truth.assertThat

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith
@@ -26,19 +25,15 @@ class DeleteDropTargetTest { 
        enableRunningInTestHarnessForTests()

    }



    // Needs mText, mTempRect, getPaddingTop, getPaddingBottom

    // availableHeight as a parameter

    @Ignore("TODO(b/279464742)")

    @Test

    fun isTextClippedVerticallyTest() {

        buttonDropTarget.mText = "My Test"

        buttonDropTarget.updateText("My Test")

        buttonDropTarget.setPadding(0, 0, 0, 0)

        buttonDropTarget.setTextMultiLine(false)



        // No space for text

        assertThat(buttonDropTarget.isTextClippedVertically(30)).isTrue()



        // Some space for text, and just enough that the text should not be clipped

        assertThat(buttonDropTarget.isTextClippedVertically(50)).isFalse()



        // A lot of space for text so the text should not be clipped

        assertThat(buttonDropTarget.isTextClippedVertically(100)).isFalse()

    }