Merge "New Autofill API: Validators.not" (62c98601) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -37556,6 +37556,7 @@ package android.service.autofill {

		public final class Validators {
		method public static android.service.autofill.Validator and(android.service.autofill.Validator...);
		method public static android.service.autofill.Validator not(android.service.autofill.Validator);
		method public static android.service.autofill.Validator or(android.service.autofill.Validator...);
		}

core/java/android/service/autofill/NegationValidator.java

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.service.autofill;

		import static android.view.autofill.Helper.sDebug;

		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.util.Preconditions;

		/**
		* Validator used to implement a {@code NOT} logical operation.
		*
		* @hide
		*/
		final class NegationValidator extends InternalValidator {
		@NonNull private final InternalValidator mValidator;

		NegationValidator(@NonNull InternalValidator validator) {
		mValidator = Preconditions.checkNotNull(validator);
		}

		@Override
		public boolean isValid(@NonNull ValueFinder finder) {
		return !mValidator.isValid(finder);
		}

		/////////////////////////////////////
		// Object "contract" methods. //
		/////////////////////////////////////
		@Override
		public String toString() {
		if (!sDebug) return super.toString();

		return "NegationValidator: [validator=" + mValidator + "]";
		}

		/////////////////////////////////////
		// Parcelable "contract" methods. //
		/////////////////////////////////////
		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeParcelable(mValidator, flags);
		}

		public static final Parcelable.Creator<NegationValidator> CREATOR =
		new Parcelable.Creator<NegationValidator>() {
		@Override
		public NegationValidator createFromParcel(Parcel parcel) {
		return new NegationValidator(parcel.readParcelable(null));
		}

		@Override
		public NegationValidator[] newArray(int size) {
		return new NegationValidator[size];
		}
		};
		}

core/java/android/service/autofill/Validators.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,19 @@ public final class Validators {
		return new OptionalValidators(getInternalValidators(validators));
		}

		/**
		* Creates a validator that is valid only if {@code validator} is not.
		*
		* @throws IllegalArgumentException if {@code validator} is an instance of a class that is not
		* provided by the Android System.
		*/
		@NonNull
		public static Validator not(@NonNull Validator validator) {
		Preconditions.checkArgument(validator instanceof InternalValidator,
		"validator not provided by Android System: " + validator);
		return new NegationValidator((InternalValidator) validator);
		}

		private static InternalValidator[] getInternalValidators(Validator[] validators) {
		Preconditions.checkArrayElementsNotNull(validators, "validators");