DO NOT MERGE Migrate Car Launcher to androidx.
Bug: 109894868
Test: build and deploy
Change-Id: I6402aaabfe787d10f05bd8163738e4e23793cb07
diff --git a/Android.mk b/Android.mk
index b7c8fad..8166c7e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,11 +42,11 @@
LOCAL_DEX_PREOPT := false
LOCAL_STATIC_ANDROID_LIBRARIES += \
- android-support-car \
- android-support-constraint-layout
+ androidx.car_car \
+ androidx-constraintlayout_constraintlayout
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-constraint-layout-solver
+ androidx-constraintlayout_constraintlayout-solver
LOCAL_JAVA_LIBRARIES += android.car
diff --git a/res/layout/car_launcher.xml b/res/layout/car_launcher.xml
index aa99e10..583323b 100644
--- a/res/layout/car_launcher.xml
+++ b/res/layout/car_launcher.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -46,11 +46,11 @@
app:layout_constraintTop_toBottomOf="@+id/title"
/>
- <android.support.constraint.Guideline
+ <androidx.constraintlayout.widget.Guideline
android:id="@+id/centerLine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/com/android/car/carlauncher/AppGridActivity.java b/src/com/android/car/carlauncher/AppGridActivity.java
index 111d6ee..62d0699 100644
--- a/src/com/android/car/carlauncher/AppGridActivity.java
+++ b/src/com/android/car/carlauncher/AppGridActivity.java
@@ -36,13 +36,14 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.IBinder;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.GridLayoutManager.SpanSizeLookup;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.Log;
import android.view.View;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
diff --git a/src/com/android/car/carlauncher/AppGridAdapter.java b/src/com/android/car/carlauncher/AppGridAdapter.java
index 4f6e34a..7b1be64 100644
--- a/src/com/android/car/carlauncher/AppGridAdapter.java
+++ b/src/com/android/car/carlauncher/AppGridAdapter.java
@@ -18,11 +18,12 @@
import android.annotation.Nullable;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
diff --git a/src/com/android/car/carlauncher/AppItemViewHolder.java b/src/com/android/car/carlauncher/AppItemViewHolder.java
index 51e5b29..3007092 100644
--- a/src/com/android/car/carlauncher/AppItemViewHolder.java
+++ b/src/com/android/car/carlauncher/AppItemViewHolder.java
@@ -18,11 +18,12 @@
import android.annotation.Nullable;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
* App item view holder that contains the app icon and name.
*/
diff --git a/src/com/android/car/carlauncher/RecentAppsRowViewHolder.java b/src/com/android/car/carlauncher/RecentAppsRowViewHolder.java
index 582e059..8090fe5 100644
--- a/src/com/android/car/carlauncher/RecentAppsRowViewHolder.java
+++ b/src/com/android/car/carlauncher/RecentAppsRowViewHolder.java
@@ -18,7 +18,6 @@
import android.annotation.Nullable;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -26,6 +25,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.List;
/**
diff --git a/src/com/android/car/carlauncher/SearchResultAdapter.java b/src/com/android/car/carlauncher/SearchResultAdapter.java
index 3d282c3..6844dee 100644
--- a/src/com/android/car/carlauncher/SearchResultAdapter.java
+++ b/src/com/android/car/carlauncher/SearchResultAdapter.java
@@ -16,8 +16,6 @@
package com.android.car.carlauncher;
import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Filter;
@@ -25,6 +23,9 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
