Commit b9bcc5a8 authored by Ben Joyce's avatar Ben Joyce Committed by Commit Bot

Migrate asynclayoutinflator to androidx references.

Bug: 1052460
Change-Id: I1b72d3f0d6773dde050c79fac21807fae7d9b1c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086813
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746746}
parent 126a5e92
...@@ -117,14 +117,6 @@ java_group("com_android_support_appcompat_v7_java") { ...@@ -117,14 +117,6 @@ java_group("com_android_support_appcompat_v7_java") {
] ]
} }
java_group("com_android_support_asynclayoutinflater_java") {
deps = [
":${target_name}_orig__unpack_aar",
":androidx_asynclayoutinflater_asynclayoutinflater_java",
]
input_jars_paths = [ "${target_out_dir}/com_android_support_asynclayoutinflater_java_orig/classes.jar" ]
}
java_group("com_android_support_cardview_v7_java") { java_group("com_android_support_cardview_v7_java") {
deps = [ deps = [
":${target_name}_orig__unpack_aar", ":${target_name}_orig__unpack_aar",
......
...@@ -335,7 +335,7 @@ android_library("ui_full_java") { ...@@ -335,7 +335,7 @@ android_library("ui_full_java") {
"//base:jni_java", "//base:jni_java",
"//third_party/android_deps:android_support_v7_appcompat_java", "//third_party/android_deps:android_support_v7_appcompat_java",
"//third_party/android_deps:androidx_annotation_annotation_java", "//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:com_android_support_asynclayoutinflater_java", "//third_party/android_deps:androidx_asynclayoutinflater_asynclayoutinflater_java",
"//third_party/android_deps:com_android_support_recyclerview_v7_java", "//third_party/android_deps:com_android_support_recyclerview_v7_java",
"//ui/base/mojom:cursor_type_java", "//ui/base/mojom:cursor_type_java",
] ]
......
...@@ -8,7 +8,6 @@ import android.annotation.SuppressLint; ...@@ -8,7 +8,6 @@ import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.support.v4.view.AsyncLayoutInflater;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -16,6 +15,7 @@ import android.view.ViewGroup; ...@@ -16,6 +15,7 @@ import android.view.ViewGroup;
import android.view.ViewParent; import android.view.ViewParent;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.asynclayoutinflater.view.AsyncLayoutInflater;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.ObserverList; import org.chromium.base.ObserverList;
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
package org.chromium.ui.shadows; package org.chromium.ui.shadows;
import android.content.Context; import android.content.Context;
import android.support.v4.view.AsyncLayoutInflater;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -13,6 +12,7 @@ import android.view.ViewGroup; ...@@ -13,6 +12,7 @@ import android.view.ViewGroup;
import androidx.annotation.LayoutRes; import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.asynclayoutinflater.view.AsyncLayoutInflater;
import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements; import org.robolectric.annotation.Implements;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment