Migrated various apps under packages/services/Telephony/testapps to androidx
Bug: 76692459
Test: make ImsTestApp EmbmsTestDownloadApp
Change-Id: I33fc9ae958d61b1e56e80fa7e3ff00cd5e5cfefb
diff --git a/testapps/EmbmsTestDownloadApp/Android.mk b/testapps/EmbmsTestDownloadApp/Android.mk
index 445357c..bd53d79 100644
--- a/testapps/EmbmsTestDownloadApp/Android.mk
+++ b/testapps/EmbmsTestDownloadApp/Android.mk
@@ -2,10 +2,10 @@
# Build the Sample Embms Download frontend
include $(CLEAR_VARS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-v7-recyclerview \
- android-support-v4
+LOCAL_USE_AAPT2 := true
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.recyclerview_recyclerview \
+ androidx.legacy_legacy-support-v4
src_dirs := src
res_dirs := res
diff --git a/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml b/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
index 8bbc806..8008414 100644
--- a/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
+++ b/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
@@ -30,7 +30,7 @@
android:id="@+id/progress_window"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/downloaded_images"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
index 78fa34f..f4a0d3c 100644
--- a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
+++ b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
@@ -23,8 +23,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.telephony.MbmsDownloadSession;
import android.telephony.SubscriptionManager;
import android.telephony.mbms.DownloadProgressListener;
@@ -44,6 +42,9 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/testapps/ImsTestService/Android.mk b/testapps/ImsTestService/Android.mk
index 29df224..2869c86 100644
--- a/testapps/ImsTestService/Android.mk
+++ b/testapps/ImsTestService/Android.mk
@@ -5,10 +5,10 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
- android-support-v4 \
- android-support-v7-appcompat \
- android-support-v7-recyclerview \
- android-support-v7-cardview
+ androidx.legacy_legacy-support-v4 \
+ androidx.appcompat_appcompat \
+ androidx.recyclerview_recyclerview \
+ androidx.cardview_cardview
LOCAL_USE_AAPT2 := true
diff --git a/testapps/ImsTestService/res/layout/ims_connection.xml b/testapps/ImsTestService/res/layout/ims_connection.xml
index 4c08082..b6aa706 100644
--- a/testapps/ImsTestService/res/layout/ims_connection.xml
+++ b/testapps/ImsTestService/res/layout/ims_connection.xml
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_gravity="center"
@@ -41,4 +41,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" android:text="@string/features_check_rcs"/>
</LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file