Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60f2b04 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Add work background/color to BiometricPrompt for managed profiles"

parents c67235e4 1b9f8dfb

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,7 @@ oneway interface IStatusBar 




    // Used to show the dialog when BiometricService starts authentication

    // Used to show the dialog when BiometricService starts authentication

    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type,

    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type,

            boolean requireConfirmation);

            boolean requireConfirmation, int userId);

    // Used to hide the dialog when a biometric is authenticated

    // Used to hide the dialog when a biometric is authenticated

    void onBiometricAuthenticated();

    void onBiometricAuthenticated();

    // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

    // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ interface IStatusBarService 




    // Used to show the dialog when BiometricService starts authentication

    // Used to show the dialog when BiometricService starts authentication

    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type,

    void showBiometricDialog(in Bundle bundle, IBiometricPromptReceiver receiver, int type,

            boolean requireConfirmation);

            boolean requireConfirmation, int userId);

    // Used to hide the dialog when a biometric is authenticated

    // Used to hide the dialog when a biometric is authenticated

    void onBiometricAuthenticated();

    void onBiometricAuthenticated();

    // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

    // Used to set a temporary message, e.g. fingerprint not recognized, finger moved too fast, etc

packages/SystemUI/res/drawable-nodpi/work_challenge_background.png

0 → 100644
+205 KiB
Loading image diff...

packages/SystemUI/res/layout/biometric_dialog.xml

+146 −134
Original line number Original line Diff line number Diff line
@@ -14,8 +14,18 @@ 
  ~ See the License for the specific language governing permissions and

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  ~ limitations under the License

  -->

  -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/layout"

    android:id="@+id/layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <ImageView

        android:id="@+id/background"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:scaleType="center" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:gravity="bottom"

        android:gravity="bottom"
@@ -168,3 +178,5 @@ 
        </LinearLayout>

        </LinearLayout>





    </LinearLayout>

    </LinearLayout>



</FrameLayout>

packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogImpl.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 




    @Override

    @Override

    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver, int type,

    public void showBiometricDialog(Bundle bundle, IBiometricPromptReceiver receiver, int type,

            boolean requireConfirmation) {

            boolean requireConfirmation, int userId) {

        if (DEBUG) Log.d(TAG, "showBiometricDialog, type: " + type);

        if (DEBUG) Log.d(TAG, "showBiometricDialog, type: " + type);

        // Remove these messages as they are part of the previous client

        // Remove these messages as they are part of the previous client

        mHandler.removeMessages(MSG_BIOMETRIC_ERROR);

        mHandler.removeMessages(MSG_BIOMETRIC_ERROR);
@@ -151,6 +151,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 
        args.arg2 = receiver;

        args.arg2 = receiver;

        args.argi1 = type;

        args.argi1 = type;

        args.arg3 = requireConfirmation;

        args.arg3 = requireConfirmation;

        args.argi2 = userId;

        mHandler.obtainMessage(MSG_SHOW_DIALOG, args).sendToTarget();

        mHandler.obtainMessage(MSG_SHOW_DIALOG, args).sendToTarget();

    }

    }
@@ -195,6 +196,7 @@ public class BiometricDialogImpl extends SystemUI implements CommandQueue.Callba 
        mReceiver = (IBiometricPromptReceiver) args.arg2;

        mReceiver = (IBiometricPromptReceiver) args.arg2;

        mCurrentDialog.setBundle((Bundle)args.arg1);

        mCurrentDialog.setBundle((Bundle)args.arg1);

        mCurrentDialog.setRequireConfirmation((boolean) args.arg3);

        mCurrentDialog.setRequireConfirmation((boolean) args.arg3);

        mCurrentDialog.setUserId(args.argi2);

        mCurrentDialog.setSkipIntro(skipAnimation);

        mCurrentDialog.setSkipIntro(skipAnimation);

        mWindowManager.addView(mCurrentDialog, mCurrentDialog.getLayoutParams());

        mWindowManager.addView(mCurrentDialog, mCurrentDialog.getLayoutParams());

        mDialogShowing = true;

        mDialogShowing = true;