diff options
author | Filip Pavlis <pavlis@google.com> | 2018-03-28 19:50:09 +0100 |
---|---|---|
committer | Filip Pavlis <pavlis@google.com> | 2018-03-28 21:39:06 +0100 |
commit | 9f742420501c710ff05e62d8d851ab4e3f4cd0cc (patch) | |
tree | ddcf4e7d76a50225eeb8e4735ab59c1a389164ac | |
parent | 5130d3466990222432cdc56399f6c907b7a64916 (diff) | |
download | Terminal-9f742420501c710ff05e62d8d851ab4e3f4cd0cc.tar.gz |
Move Terminal to androidx.android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
Bug: 76692459
Test: make Terminal and run on emulator
Change-Id: I7dd06a956ea21b61b43a9acb1da21a90987f1fa2
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | res/layout/activity.xml | 6 | ||||
-rw-r--r-- | src/com/android/terminal/TerminalActivity.java | 6 |
3 files changed, 9 insertions, 7 deletions
@@ -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.content.ServiceConnection; 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; |