LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated various apps under development/samples/ApiDemos to androidx

Browse Source 
Bug: 76692459
Test: make ApiDemos
Change-Id: Ie02783ba14b294a220383a3d53e96a6fdb3117b8
This commit is contained in:
KOUSHIK PANUGANTI
2018-04-24 17:13:55 -07:00
parent 5849febc17
commit 7f203340ff
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/Android.mk
View File

@@ -11,7 +11,7 @@ LOCAL_SRC_FILES := \
src/com/example/android/apis/app/ISecondary.aidl \
LOCAL_STATIC_ANDROID_LIBRARIES += \
android-support-v4
androidx.legacy_legacy-support-v4
LOCAL_USE_AAPT2 := true

2
samples/ApiDemos/AndroidManifest.xml
View File

@@ -1360,7 +1360,7 @@
<!-- A FileProvider for passing the APK to be installed to the system. -->
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="com.example.android.apis.installapkprovider"
android:exported="false"
android:grantUriPermissions="true">

2
samples/ApiDemos/src/com/example/android/apis/app/PrintBitmap.java
View File

@@ -20,7 +20,7 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.print.PrintManager;
import android.support.v4.print.PrintHelper;
import androidx.print.PrintHelper;
import android.view.Menu;
import android.view.MenuItem;
import android.webkit.WebView;

2
samples/ApiDemos/src/com/example/android/apis/content/InstallApk.java
View File

@@ -26,7 +26,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;

4
samples/ApiDemos/src/com/example/android/apis/inputmethod/HintLocales.java
View File

@@ -19,8 +19,8 @@ package com.example.android.apis.inputmethod;
import android.app.Activity;
import android.os.Bundle;
import android.os.LocaleList;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;