diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-29 07:26:26 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-29 07:26:26 +0000 |
commit | f49fa8469edb33d080e8687f49d7a2e4c658ee4a (patch) | |
tree | ddcf4e7d76a50225eeb8e4735ab59c1a389164ac | |
parent | 0d8db451bab55fd5b0a34a7dd23b53b20ada3f56 (diff) | |
parent | 9f742420501c710ff05e62d8d851ab4e3f4cd0cc (diff) | |
download | Terminal-android-cts-9.0_r7.tar.gz |
Snap for 4686875 from 9f742420501c710ff05e62d8d851ab4e3f4cd0cc to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: I25d6392a7dbd6019507c8089478e39cf64ac24ec
-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; |