Snap for 4686875 from 9f742420501c710ff05e62d8d851ab4e3f4cd0cc to pi-release
Change-Id: I25d6392a7dbd6019507c8089478e39cf64ac24ec
diff --git a/Android.mk b/Android.mk
index dfbcbfc..7998a2f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,11 +1,13 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_USE_AAPT2 := true
+
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES := androidx.viewpager_viewpager
LOCAL_JNI_SHARED_LIBRARIES := libjni_terminal
diff --git a/res/layout/activity.xml b/res/layout/activity.xml
index 2138c5a..86c36e2 100644
--- a/res/layout/activity.xml
+++ b/res/layout/activity.xml
@@ -14,16 +14,16 @@
limitations under the License.
-->
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.v4.view.PagerTitleStrip
+ <androidx.viewpager.widget.PagerTitleStrip
android:id="@+id/titles"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top" />
-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
diff --git a/src/com/android/terminal/TerminalActivity.java b/src/com/android/terminal/TerminalActivity.java
index 025a14a..5580fdd 100644
--- a/src/com/android/terminal/TerminalActivity.java
+++ b/src/com/android/terminal/TerminalActivity.java
@@ -26,9 +26,9 @@
import android.os.Bundle;
import android.os.IBinder;
import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.PagerTitleStrip;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.PagerTitleStrip;
+import androidx.viewpager.widget.ViewPager;
import android.util.Log;
import android.util.SparseArray;
import android.view.Menu;
