Merge "Add setter for textIdEntry in ViewNode" into udc-qpr-dev (f8b9dd9f) · Commits · e / os / android_frameworks_base

core/java/android/view/contentcapture/ViewNode.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -480,6 +480,11 @@ public final class ViewNode extends AssistStructure.ViewNode {
		return mLocaleList;
		}

		/** @hide */
		public void setTextIdEntry(@NonNull String textIdEntry) {
		mTextIdEntry = textIdEntry;
		}

		private void writeSelfToParcel(@NonNull Parcel parcel, int parcelFlags) {
		long nodeFlags = mFlags;

core/tests/coretests/src/android/view/contentcapture/ViewNodeTest.java

+38 −27

Original line number	Diff line number	Diff line
		@@ -41,49 +41,60 @@ public class ViewNodeTest {

		private final Context mContext = InstrumentationRegistry.getTargetContext();

		private final View mView = new View(mContext);

		private final ViewStructureImpl mViewStructure = new ViewStructureImpl(mView);

		private final ViewNode mViewNode = mViewStructure.getNode();

		@Mock
		private HtmlInfo mHtmlInfoMock;

		@Test
		public void testUnsupportedProperties() {
		View view = new View(mContext);
		mViewStructure.setChildCount(1);
		assertThat(mViewNode.getChildCount()).isEqualTo(0);

		mViewStructure.addChildCount(1);
		assertThat(mViewNode.getChildCount()).isEqualTo(0);

		ViewStructureImpl structure = new ViewStructureImpl(view);
		ViewNode node = structure.getNode();
		assertThat(mViewStructure.newChild(0)).isNull();
		assertThat(mViewNode.getChildCount()).isEqualTo(0);

		structure.setChildCount(1);
		assertThat(node.getChildCount()).isEqualTo(0);
		assertThat(mViewStructure.asyncNewChild(0)).isNull();
		assertThat(mViewNode.getChildCount()).isEqualTo(0);

		structure.addChildCount(1);
		assertThat(node.getChildCount()).isEqualTo(0);
		mViewStructure.asyncCommit();
		assertThat(mViewNode.getChildCount()).isEqualTo(0);

		assertThat(structure.newChild(0)).isNull();
		assertThat(node.getChildCount()).isEqualTo(0);
		mViewStructure.setWebDomain("Y U NO SET?");
		assertThat(mViewNode.getWebDomain()).isNull();

		assertThat(structure.asyncNewChild(0)).isNull();
		assertThat(node.getChildCount()).isEqualTo(0);
		assertThat(mViewStructure.newHtmlInfoBuilder("WHATEVER")).isNull();

		structure.asyncCommit();
		assertThat(node.getChildCount()).isEqualTo(0);
		mViewStructure.setHtmlInfo(mHtmlInfoMock);
		assertThat(mViewNode.getHtmlInfo()).isNull();

		structure.setWebDomain("Y U NO SET?");
		assertThat(node.getWebDomain()).isNull();
		mViewStructure.setDataIsSensitive(true);

		assertThat(structure.newHtmlInfoBuilder("WHATEVER")).isNull();
		assertThat(mViewStructure.getTempRect()).isNull();

		structure.setHtmlInfo(mHtmlInfoMock);
		assertThat(node.getHtmlInfo()).isNull();
		// Graphic properties
		mViewStructure.setElevation(6.66f);
		assertThat(mViewNode.getElevation()).isEqualTo(0f);
		mViewStructure.setAlpha(66.6f);
		assertThat(mViewNode.getAlpha()).isEqualTo(1.0f);
		mViewStructure.setTransformation(Matrix.IDENTITY_MATRIX);
		assertThat(mViewNode.getTransformation()).isNull();
		}

		structure.setDataIsSensitive(true);
		@Test
		public void testGetSet_textIdEntry() {
		assertThat(mViewNode.getTextIdEntry()).isNull();

		assertThat(structure.getTempRect()).isNull();
		String expected = "TEXT_ID_ENTRY";
		mViewNode.setTextIdEntry(expected);

		// Graphic properties
		structure.setElevation(6.66f);
		assertThat(node.getElevation()).isWithin(1.0e-10f).of(0f);
		structure.setAlpha(66.6f);
		assertThat(node.getAlpha()).isWithin(1.0e-10f).of(1.0f);
		structure.setTransformation(Matrix.IDENTITY_MATRIX);
		assertThat(node.getTransformation()).isNull();
		assertThat(mViewNode.getTextIdEntry()).isEqualTo(expected);
		}
		}