Merge /usr/local/google/home/yuemingw/android/ub-testdpc-pic-release/vendor/unbundled_google/packages/TestDPC into new-version

yuemingw · yuemingw · commit 3f316bfec34f · 2018-07-31T16:59:04.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,16 +7,17 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 01
+    versionBuild = 04
 }
 
 android {
-    compileSdkVersion 'android-P'
+    compileSdkVersion 28
+    buildToolsVersion "28.0.0"
 
     defaultConfig {
         applicationId "com.afwsamples.testdpc"
         minSdkVersion 21
-        targetSdkVersion 'P'
+        targetSdkVersion 28
         versionCode versionMajor * 1000 + versionMinor * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}.${versionBuild}"
         multiDexEnabled true
diff --git a/app/src/main/java/com/afwsamples/testdpc/AddAccountActivity.java b/app/src/main/java/com/afwsamples/testdpc/AddAccountActivity.java
@@ -70,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_add_account);
         GlifLayout layout = findViewById(R.id.setup_wizard_layout);
-        layout.findViewById(R.id.next_button).setOnClickListener(this::onNavigateNext);
+        layout.findViewById(R.id.suw_navbar_next).setOnClickListener(this::onNavigateNext);
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
diff --git a/app/src/main/java/com/afwsamples/testdpc/FinalizeActivity.java b/app/src/main/java/com/afwsamples/testdpc/FinalizeActivity.java
@@ -48,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         setContentView(R.layout.finalize_activity);
         mSetupWizardLayout = findViewById(R.id.setup_wizard_layout);
-        mFinishButton = mSetupWizardLayout.findViewById(R.id.next_button);
+        mFinishButton = mSetupWizardLayout.findViewById(R.id.suw_navbar_next);
         mFinishButton.setText(R.string.finish_button);
         mFinishButton.setOnClickListener(this::onNavigateNext);
 
diff --git a/app/src/main/java/com/afwsamples/testdpc/SetupManagementFragment.java b/app/src/main/java/com/afwsamples/testdpc/SetupManagementFragment.java
@@ -110,7 +110,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.setup_management_fragment, container, false);
         GlifLayout layout = view.findViewById(R.id.setup_wizard_layout);
 
-        mNavigationNextButton = layout.findViewById(R.id.setup_button);
+        mNavigationNextButton = layout.findViewById(R.id.suw_navbar_next);
         mNavigationNextButton.setOnClickListener(this::onNavigateNext);
         layout.findViewById(R.id.exit_button).setOnClickListener(this::onNavigateBack);
 
diff --git a/app/src/main/java/com/afwsamples/testdpc/common/BaseManageComponentFragment.java b/app/src/main/java/com/afwsamples/testdpc/common/BaseManageComponentFragment.java
@@ -81,10 +81,15 @@ public void onNothingSelected(AdapterView<?> parent) {
         view.findViewById(R.id.reset_app).setOnClickListener(this);
         view.findViewById(R.id.add_new_row).setOnClickListener(this);
         view.findViewById(R.id.load_default_button).setOnClickListener(this);
-        onSpinnerItemSelected((T) mManagedAppsSpinner.getSelectedItem());
         return view;
     }
 
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        onSpinnerItemSelected((T) mManagedAppsSpinner.getSelectedItem());
+    }
+
     protected abstract SpinnerAdapter createSpinnerAdapter();
 
     protected abstract BaseAdapter createListAdapter();
diff --git a/app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java b/app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java
@@ -93,9 +93,6 @@ public class DpcPreferenceHelper {
      *         not yet assigned.
      */
     private int getDeviceSdkInt() {
-        if (BuildCompat.isAtLeastP()) {
-            return Build.VERSION_CODES.CUR_DEVELOPMENT;
-        }
         return Build.VERSION.SDK_INT;
     }
 
@@ -220,10 +217,6 @@ public void disableIfConstraintsNotMet() {
      */
     private CharSequence findConstraintViolation() {
         if (getDeviceSdkInt() < mMinSdkVersion) {
-            // FIXME: Remove this special checking once P is out.
-            if (mMinSdkVersion > 27) {
-                return mContext.getString(R.string.requires_preview_release);
-            }
             return mContext.getString(R.string.requires_android_api_level, mMinSdkVersion);
         }
 
diff --git a/app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java b/app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java
@@ -145,8 +145,7 @@ private void constrainPerferences() {
         }
         for (String restriction: UserRestriction.PIC_PLUS_RESTRICTIONS) {
             DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
-            // TODO: Replace the following version code with P when ready
-            pref.setMinSdkVersion(Build.VERSION_CODES.CUR_DEVELOPMENT);
+            pref.setMinSdkVersion(Build.VERSION_CODES.P);
         }
         for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {
             DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
diff --git a/app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java b/app/src/main/java/com/afwsamples/testdpc/policy/keyguard/LockScreenPolicyFragment.java
@@ -69,6 +69,8 @@ abstract static class Keys {
         static final String MAX_TIME_SCREEN_LOCK = "key_max_time_screen_lock";
         static final String MAX_TIME_SCREEN_LOCK_ALL = "key_max_time_screen_lock_aggregate";
 
+        static final String KEYGUARD_DISABLE_FACE = "keyguard_disable_face";
+        static final String KEYGUARD_DISABLE_IRIS = "keyguard_disable_iris";
         static final String KEYGUARD_DISABLE_FINGERPRINT = "keyguard_disable_fingerprint";
         static final String KEYGUARD_DISABLE_REMOTE_INPUT = "keyguard_disable_remote_input";
         static final String KEYGUARD_DISABLE_SECURE_CAMERA = "keyguard_disable_secure_camera";
@@ -101,9 +103,15 @@ abstract static class Keys {
         KEYGUARD_FEATURES.put(Keys.KEYGUARD_DISABLE_TRUST_AGENTS,
                 DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS);
 
+        KEYGUARD_FEATURES.put(Keys.KEYGUARD_DISABLE_FACE,
+            DevicePolicyManager.KEYGUARD_DISABLE_FACE);
+
         KEYGUARD_FEATURES.put(Keys.KEYGUARD_DISABLE_FINGERPRINT,
                 DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
 
+        KEYGUARD_FEATURES.put(Keys.KEYGUARD_DISABLE_IRIS,
+            DevicePolicyManager.KEYGUARD_DISABLE_IRIS);
+
         KEYGUARD_FEATURES.put(Keys.KEYGUARD_DISABLE_REMOTE_INPUT,
                 DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT);
     }
diff --git a/app/src/main/java/com/afwsamples/testdpc/profilepolicy/permission/ManageAppPermissionsFragment.java b/app/src/main/java/com/afwsamples/testdpc/profilepolicy/permission/ManageAppPermissionsFragment.java
@@ -32,9 +32,9 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
+import android.widget.TextView;
 import com.afwsamples.testdpc.DeviceAdminReceiver;
 import com.afwsamples.testdpc.R;
-import com.afwsamples.testdpc.common.BaseManageComponentFragment;
 import com.afwsamples.testdpc.common.ManageAppFragment;
 
 import java.util.ArrayList;
@@ -50,6 +50,7 @@ public class ManageAppPermissionsFragment extends ManageAppFragment {
 
     private DevicePolicyManager mDpm;
     private List<AppPermissionsArrayAdapter.AppPermission> mAppPermissions = new ArrayList<>();
+    private TextView mAppPermissionsView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -64,6 +65,8 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup container,
         view.findViewById(R.id.load_default_button).setVisibility(View.GONE);
         view.findViewById(R.id.add_new_row).setVisibility(View.GONE);
         view.findViewById(R.id.manage_app_button_container).setVisibility(View.GONE);
+        mAppPermissionsView = view.findViewById(R.id.error_message);
+        mAppPermissionsView.setText(R.string.app_permissions_empty);
         return view;
     }
 
@@ -107,8 +110,7 @@ protected void onSpinnerItemSelected(ApplicationInfo appInfo) {
                                 permissionState);
                 populatedPermissions.add(populatedPerm);
             }
-
-            loadAppPermissionsList(populatedPermissions);
+            displayAppPermissions(populatedPermissions);
         }
     }
 
@@ -129,12 +131,19 @@ protected BaseAdapter createListAdapter() {
         return new AppPermissionsArrayAdapter(getActivity(), 0, mAppPermissions);
     }
 
-    private void loadAppPermissionsList(
-            List<AppPermissionsArrayAdapter.AppPermission> permissions) {
-        if (permissions != null) {
-            mAppPermissions.clear();
+    /**
+     * Displays the list of permissions for the selected app. If there are no permissions to
+     * be displayed, a text view displays a message about this.
+     */
+    private void displayAppPermissions(
+        List<AppPermissionsArrayAdapter.AppPermission> permissions) {
+        mAppPermissions.clear();
+        if (permissions.isEmpty()) {
+            mAppPermissionsView.setVisibility(View.VISIBLE);
+        } else {
+            mAppPermissionsView.setVisibility(View.GONE);
             mAppPermissions.addAll(permissions);
-            mAdapter.notifyDataSetChanged();
         }
+        mAdapter.notifyDataSetChanged();
     }
 }
diff --git a/app/src/main/res/layout/manage_apps.xml b/app/src/main/res/layout/manage_apps.xml
@@ -50,6 +50,16 @@ limitations under the License.
             android:layout_alignParentRight="true"
             android:text="@string/plus" />
 
+    <TextView
+        android:id="@+id/error_message"
+        android:layout_below="@id/header_view"
+        android:layout_above="@+id/load_default_button"
+        android:visibility="gone"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:paddingTop="16dp"
+        android:paddingBottom="4dp" />
+
     <ListView
             android:id="@+id/app_list_view"
             android:layout_below="@id/header_view"
diff --git a/app/src/main/res/layout/next_footer.xml b/app/src/main/res/layout/next_footer.xml
@@ -26,7 +26,7 @@
         android:layout_weight="1" />
 
     <Button
-        android:id="@+id/next_button"
+        android:id="@+id/suw_navbar_next"
         style="@style/SuwGlifButton.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/setup_footer.xml b/app/src/main/res/layout/setup_footer.xml
@@ -35,7 +35,7 @@
         android:layout_weight="1" />
 
     <Button
-        android:id="@+id/setup_button"
+        android:id="@+id/suw_navbar_next"
         style="@style/SuwGlifButton.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -27,8 +27,7 @@
             <enum name="N" value="24" />
             <enum name="O" value="26" />
             <enum name="O_MR1" value="27" />
-            <enum name="P" value="10000" />
-            <!-- Build.VERSION_CODES.CUR_DEVELOPMENT, fill in the sdk int once it is finalized -->
+            <enum name="P" value="28" />
         </attr>
 
         <!-- Constrain a preference to DO or PO admins. -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -23,8 +23,8 @@
     <string name="set_up_device_owner">Set up device owner</string>
     <string name="set_up_management_header">Set up management</string>
     <string name="setup_management_message">This app is currently not the owner of this device or
-        profile. Please select an option below and tap SET UP to set up appropriate management by this app.</string>
-    <string name="setup_management_message_for_do">This app is currently set as device owner. Please select the options below and tap SET UP to create a profile managed by the same app</string>
+        profile. Please select an option below and tap Next to set up appropriate management by this app.</string>
+    <string name="setup_management_message_for_do">This app is currently set as device owner. Please select the options below and tap Next to create a profile managed by the same app</string>
     <string name="provisioning_not_possible">TestDPC isn\'t currently allowed to be set up as the profile or device owner.</string>
     <string name="provisioning_not_possible_for_do">TestDPC isn\'t currently allowed to create a managed profile.</string>
     <string name="exit">Exit</string>
@@ -797,13 +797,17 @@
     <string name="permission_default">Let user decide</string>
     <string name="permission_deny">Deny</string>
     <string name="manage_app_permissions">Manage app permissions</string>
+    <!-- Message displayed when there are no apps permissions to show. -->
+    <string name="app_permissions_empty">There are no permissions to display for this app.</string>
 
     <!-- Keyguard features -->
     <string name="keyguard_features">Keyguard features</string>
     <string name="keyguard_disable_secure_camera">Disable secure camera</string>
     <string name="keyguard_disable_secure_notifications">Disable secure notifications</string>
     <string name="keyguard_disable_unredacted_notifications">Disable unredacted notifications</string>
     <string name="keyguard_disable_trust_agents">Disable trust agents</string>
+    <string name="keyguard_disable_face">Disable face unlock</string>
+    <string name="keyguard_disable_iris">Disable iris unlock</string>
     <string name="keyguard_disable_fingerprint">Disable fingerprint</string>
     <string name="keyguard_disable_remote_input">Disable text entry in secure keyguard screen</string>
 
diff --git a/app/src/main/res/xml/lock_screen_preferences.xml b/app/src/main/res/xml/lock_screen_preferences.xml
@@ -86,10 +86,18 @@
             android:key="keyguard_disable_trust_agents"
             android:title="@string/keyguard_disable_trust_agents"
             testdpc:minSdkVersion="L" />
+        <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
+            android:key="keyguard_disable_face"
+            android:title="@string/keyguard_disable_face"
+            testdpc:minSdkVersion="P" />
         <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
             android:key="keyguard_disable_fingerprint"
             android:title="@string/keyguard_disable_fingerprint"
             testdpc:minSdkVersion="L" />
+        <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
+            android:key="keyguard_disable_iris"
+            android:title="@string/keyguard_disable_iris"
+            testdpc:minSdkVersion="P" />
         <com.afwsamples.testdpc.common.preference.DpcSwitchPreference
             android:key="keyguard_disable_remote_input"
             android:title="@string/keyguard_disable_remote_input"

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`48`	`48`	`}`
`49`	`49`	`setContentView(R.layout.finalize_activity);`
`50`	`50`	`mSetupWizardLayout = findViewById(R.id.setup_wizard_layout);`
`51`		`- mFinishButton = mSetupWizardLayout.findViewById(R.id.next_button);`
	`51`	`+ mFinishButton = mSetupWizardLayout.findViewById(R.id.suw_navbar_next);`
`52`	`52`	`mFinishButton.setText(R.string.finish_button);`
`53`	`53`	`mFinishButton.setOnClickListener(this::onNavigateNext);`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ private void constrainPerferences() {`
`145`	`145`	`}`
`146`	`146`	`for (String restriction: UserRestriction.PIC_PLUS_RESTRICTIONS) {`
`147`	`147`	`DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);`
`148`		`- // TODO: Replace the following version code with P when ready`
`149`		`- pref.setMinSdkVersion(Build.VERSION_CODES.CUR_DEVELOPMENT);`
	`148`	`+ pref.setMinSdkVersion(Build.VERSION_CODES.P);`
`150`	`149`	`}`
`151`	`150`	`for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {`
`152`	`151`	`DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);`