Update basicmanagedprofile sample.

Remove deprecated calls, fix small lint issues and update app icon.

Bug: 36010143
Change-Id: I7373257486e458230a99ab7d0f8ee7788c01dd7b

19 files changed, 48 insertions, 24 deletions

diff --git a/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml b/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
index 29020c3e..597ec99e 100644
--- a/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
+++ b/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
@@ -18,17 +18,16 @@
 <manifest
     package="com.example.android.basicmanagedprofile"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="21"/>
-
-    <application
-        android:icon="@drawable/ic_launcher"
+<application
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:allowBackup="true"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name=".MainActivity"
diff --git a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
index 4bbf3cb1..493a4a4c 100644
--- a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
+++ b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
@@ -27,6 +27,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -54,12 +55,12 @@ public class BasicManagedProfileFragment extends Fragment
     /**
      * Tag for logging.
      */
-    private static final String TAG = "BasicManagedProfile";
+    private static final String TAG = "ManagedProfileFragment";
 
     /**
      * Package name of calculator
      */
-    private static final String PACKAGE_NAME_CALCULATOR = "com.google.android.calculator";
+    private static final String PACKAGE_NAME_CALCULATOR = "com.android.calculator2";
 
     /**
      * Package name of Chrome
@@ -95,8 +96,8 @@ public class BasicManagedProfileFragment extends Fragment
     }
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
         // Retrieves whether the calculator app is enabled in this profile
         mCalculatorEnabled = isApplicationEnabled(PACKAGE_NAME_CALCULATOR);
         // Retrieves whether Chrome is enabled in this profile
@@ -113,8 +114,15 @@ public class BasicManagedProfileFragment extends Fragment
         Activity activity = getActivity();
         PackageManager packageManager = activity.getPackageManager();
         try {
+            int packageFlags;
+            if(Build.VERSION.SDK_INT < 24){
+                //noinspection deprecation
+                packageFlags = PackageManager.GET_UNINSTALLED_PACKAGES;
+            }else{
+                packageFlags = PackageManager.MATCH_UNINSTALLED_PACKAGES;
+            }
             ApplicationInfo applicationInfo = packageManager.getApplicationInfo(
-                    packageName, PackageManager.GET_UNINSTALLED_PACKAGES);
+                    packageName, packageFlags);
             // Return false if the app is not installed in this profile
             if (0 == (applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)) {
                 return false;
@@ -209,8 +217,15 @@ public class BasicManagedProfileFragment extends Fragment
         DevicePolicyManager devicePolicyManager =
                 (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
         try {
+            int packageFlags;
+            if(Build.VERSION.SDK_INT < 24){
+                //noinspection deprecation
+                packageFlags = PackageManager.GET_UNINSTALLED_PACKAGES;
+            }else{
+                packageFlags = PackageManager.MATCH_UNINSTALLED_PACKAGES;
+            }
             ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName,
-                    PackageManager.GET_UNINSTALLED_PACKAGES);
+                    packageFlags);
             // Here, we check the ApplicationInfo of the target app, and see if the flags have
             // ApplicationInfo.FLAG_INSTALLED turned on using bitwise operation.
             if (0 == (applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)) {
diff --git a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
index deed2f63..42b47856 100644
--- a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
+++ b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
@@ -22,7 +22,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 
 /**
diff --git a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
index 7da6e02d..399f40de 100644
--- a/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
+++ b/admin/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
@@ -18,16 +18,16 @@ package com.example.android.basicmanagedprofile;
 
 import android.app.Activity;
 import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
-
 /**
  * This {@link Fragment} handles initiation of managed profile provisioning.
  */
@@ -72,9 +72,20 @@ public class SetupProfileFragment extends Fragment implements View.OnClickListen
         if (null == activity) {
             return;
         }
-        Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE);
-        intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
-                        activity.getApplicationContext().getPackageName());
+        Intent intent = new Intent(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE);
+
+        // Use a different intent extra below M to configure the admin component.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            //noinspection deprecation
+            intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
+                    activity.getApplicationContext().getPackageName());
+        } else {
+            final ComponentName component = new ComponentName(activity,
+                    BasicDeviceAdminReceiver.class.getName());
+            intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                    component);
+        }
+
         if (intent.resolveActivity(activity.getPackageManager()) != null) {
             startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE);
             activity.finish();
diff --git a/admin/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index c8feb76a..00000000
--- a/admin/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
diff --git a/admin/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 4bf549ef..00000000
--- a/admin/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
diff --git a/admin/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 33afaaa7..00000000
--- a/admin/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
diff --git a/admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index d6f927a4..00000000
--- a/admin/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
diff --git a/admin/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml b/admin/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml
index b91b9bd1..ab7fa811 100644
--- a/admin/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml
+++ b/admin/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml
@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_launcher"/>
+    <item android:drawable="@mipmap/ic_launcher"/>
     <item
         android:top="56dp"
         android:left="56dp"
diff --git a/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
index a5ba580a..a2512555 100644
--- a/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
+++ b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.android.basicmanagedprofile.MainActivity.MainFragment">
+    tools:context="com.example.android.basicmanagedprofile.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
index 6b1e0d32..b3c9f496 100644
--- a/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
+++ b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.android.basicmanagedprofile.MainActivity.MainFragment">
+    tools:context="com.example.android.basicmanagedprofile.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/admin/BasicManagedProfile/Application/src/main/res/mipmap-hdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..9381f9e4
--- /dev/null
+++ b/admin/BasicManagedProfile/Application/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/admin/BasicManagedProfile/Application/src/main/res/mipmap-mdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..99999d32
--- /dev/null
+++ b/admin/BasicManagedProfile/Application/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/admin/BasicManagedProfile/Application/src/main/res/mipmap-xhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..f720cf23
--- /dev/null
+++ b/admin/BasicManagedProfile/Application/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/admin/BasicManagedProfile/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..c727bcfc
--- /dev/null
+++ b/admin/BasicManagedProfile/Application/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/admin/BasicManagedProfile/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/admin/BasicManagedProfile/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..a5d8fa93
--- /dev/null
+++ b/admin/BasicManagedProfile/Application/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/admin/BasicManagedProfile/screenshots/icon-web.png b/admin/BasicManagedProfile/screenshots/icon-web.png
index 9ffff0db..185db00e 100755..100644
--- a/admin/BasicManagedProfile/screenshots/icon-web.png
+++ b/admin/BasicManagedProfile/screenshots/icon-web.png
diff --git a/admin/BasicManagedProfile/screenshots/set_up.png b/admin/BasicManagedProfile/screenshots/set_up.png
index 18d39989..e7fecb60 100644
--- a/admin/BasicManagedProfile/screenshots/set_up.png
+++ b/admin/BasicManagedProfile/screenshots/set_up.png
diff --git a/admin/BasicManagedProfile/template-params.xml b/admin/BasicManagedProfile/template-params.xml
index 313a5879..4e3c97dd 100644
--- a/admin/BasicManagedProfile/template-params.xml
+++ b/admin/BasicManagedProfile/template-params.xml
@@ -45,7 +45,7 @@
         <languages>Java</languages>
         <solutions>Mobile</solutions>
         <level>ADVANCED</level>
-        <icon>screenshotsicon-web.png</icon>
+        <icon>screenshots/icon-web.png</icon>
         <screenshots>
             <img>screenshots/not_set_up.png</img>
             <img>screenshots/set_up.png</img>