diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-08-14 15:21:45 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-08-14 15:22:12 -0700 |
commit | d230307a958189041a7d5616e89fb2966011b55e (patch) | |
tree | 0e3684f094f08066de7cb68d49779a60111feded /src/com/android/launcher3/allapps | |
parent | a950d40d0930abff76fd49a322715fd42cad80c9 (diff) | |
download | android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.tar.gz android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.tar.bz2 android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.zip |
Migrating to android-x
Change-Id: I9a774152d13a541e8496dd84f2469bfed407f86d
Diffstat (limited to 'src/com/android/launcher3/allapps')
7 files changed, 24 insertions, 21 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index cf7842a59..e5cda21f1 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -23,12 +23,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.os.Bundle; import android.os.Process; -import android.support.animation.DynamicAnimation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.text.Selection; import android.text.SpannableStringBuilder; import android.util.AttributeSet; @@ -59,6 +53,13 @@ import com.android.launcher3.views.BottomUserEducationView; import com.android.launcher3.views.RecyclerViewFastScroller; import com.android.launcher3.views.SpringRelativeLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.dynamicanimation.animation.DynamicAnimation; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * The all apps view container. */ diff --git a/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java b/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java index e08cb15cd..3ee1293e2 100644 --- a/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java +++ b/src/com/android/launcher3/allapps/AllAppsFastScrollHelper.java @@ -15,13 +15,13 @@ */ package com.android.launcher3.allapps; -import android.support.v7.widget.RecyclerView; - import com.android.launcher3.util.Thunk; import java.util.HashSet; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + public class AllAppsFastScrollHelper implements AllAppsGridAdapter.BindViewCallback { private static final int INITIAL_TOUCH_SETTLING_DURATION = 100; diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 27fc53a82..0f1355019 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -18,11 +18,6 @@ package com.android.launcher3.allapps; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.support.v4.view.accessibility.AccessibilityEventCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -44,6 +39,12 @@ import com.android.launcher3.util.PackageManagerHelper; import java.util.List; +import androidx.core.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * The grid view adapter of all the apps. */ diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java index a6c1346f6..adc4a72d1 100644 --- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java +++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.util.SparseIntArray; import android.view.MotionEvent; @@ -41,6 +40,8 @@ import com.android.launcher3.views.RecyclerViewFastScroller; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + /** * A RecyclerView with custom fast scroll support for the all apps view. */ diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index eaa777416..5348349f4 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java @@ -19,9 +19,6 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -32,6 +29,10 @@ import android.widget.LinearLayout; import com.android.launcher3.R; import com.android.launcher3.anim.PropertySetter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + public class FloatingHeaderView extends LinearLayout implements ValueAnimator.AnimatorUpdateListener { diff --git a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java index 31c5914b8..decdcc0aa 100644 --- a/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java +++ b/src/com/android/launcher3/allapps/PersonalWorkSlidingTabStrip.java @@ -19,8 +19,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -32,6 +30,9 @@ import com.android.launcher3.Utilities; import com.android.launcher3.pageindicators.PageIndicator; import com.android.launcher3.util.Themes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Supports two indicator colors, dedicated for personal and work tabs. */ diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java index dcc45545a..91be504ef 100644 --- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java +++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java @@ -15,8 +15,6 @@ */ package com.android.launcher3.allapps.search; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; |