BasicManagedProfile: Clear app restrictions

Bug: 15588313
Change-Id: I6f484de3264de590aadc013fa8a21cbe173c093f

4 files changed, 38 insertions, 3 deletions

diff --git a/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml b/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
index 6ba23614..29020c3e 100644
--- a/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
+++ b/admin/BasicManagedProfile/Application/src/main/AndroidManifest.xml
@@ -15,16 +15,20 @@
  limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
     package="com.example.android.basicmanagedprofile"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+    <uses-sdk
+        android:minSdkVersion="21"
+        android:targetSdkVersion="21"/>
 
     <application
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher">
+        android:theme="@style/AppTheme">
 
         <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 bb3f2390..beb8d4a2 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
@@ -133,6 +133,7 @@ public class BasicManagedProfileFragment extends Fragment
     public void onViewCreated(View view, Bundle savedInstanceState) {
         // Bind event listeners and initial states
         view.findViewById(R.id.set_chrome_restrictions).setOnClickListener(this);
+        view.findViewById(R.id.clear_chrome_restrictions).setOnClickListener(this);
         view.findViewById(R.id.enable_forwarding).setOnClickListener(this);
         view.findViewById(R.id.disable_forwarding).setOnClickListener(this);
         view.findViewById(R.id.send_intent).setOnClickListener(this);
@@ -153,6 +154,10 @@ public class BasicManagedProfileFragment extends Fragment
                 setChromeRestrictions();
                 break;
             }
+            case R.id.clear_chrome_restrictions: {
+                clearChromeRestrictions();
+                break;
+            }
             case R.id.enable_forwarding: {
                 enableForwarding();
                 break;
@@ -285,6 +290,24 @@ public class BasicManagedProfileFragment extends Fragment
     }
 
     /**
+     * Clears restrictions to Chrome
+     */
+    private void clearChromeRestrictions() {
+        final Activity activity = getActivity();
+        if (null == activity) {
+            return;
+        }
+        final DevicePolicyManager manager =
+                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        // In order to clear restrictions, pass null as the restriction Bundle for
+        // setApplicationRestrictions
+        manager.setApplicationRestrictions
+                (BasicDeviceAdminReceiver.getComponentName(activity),
+                        PACKAGE_NAME_CHROME, null);
+        Toast.makeText(activity, R.string.cleared, Toast.LENGTH_SHORT).show();
+    }
+
+    /**
      * Enables forwarding of share intent between private account and managed profile.
      */
     private void enableForwarding() {
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 7dcb9f2f..a5ba580a 100644
--- a/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
+++ b/admin/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
@@ -60,6 +60,12 @@
             android:layout_height="wrap_content"
             android:text="@string/set_chrome_restrictions" />
 
+        <Button
+            android:id="@+id/clear_chrome_restrictions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_chrome_restrictions" />
+
         <!-- Intent Forwarding -->
 
         <Button
diff --git a/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml b/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml
index 3e9f8fa4..240c7aba 100644
--- a/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml
+++ b/admin/BasicManagedProfile/Application/src/main/res/values/strings.xml
@@ -28,11 +28,13 @@
     <string name="toggle_calculator">Calculator in this profile: </string>
     <string name="toggle_chrome">Chrome in this profile:</string>
     <string name="set_chrome_restrictions">Set Chrome restrictions</string>
+    <string name="clear_chrome_restrictions">Clear Chrome restrictions</string>
     <string name="icon">Icon</string>
     <string name="profile_name">Sample Managed Profile</string>
     <string name="enabled">Enabled</string>
     <string name="disabled">Disabled</string>
     <string name="restrictions_set">Restrictions set.</string>
     <string name="activity_not_found">No app can handle this intent.</string>
+    <string name="cleared">Cleared.</string>
 
 </resources>