Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update margin / corners on BiometricDialog"

Browse Source
This commit is contained in:
Kevin Chyn
2018-11-08 18:51:48 +00:00
committed by Android (Google) Code Review
parent 6aceee0b7c bb26914777
commit 7d54535d62
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/drawable/biometric_dialog_bg.xml
View File

@@ -21,6 +21,6 @@
<corners android:radius="1dp"
android:topLeftRadius="@dimen/biometric_dialog_corner_size"
android:topRightRadius="@dimen/biometric_dialog_corner_size"
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"/>
android:bottomLeftRadius="@dimen/biometric_dialog_corner_size"
android:bottomRightRadius="@dimen/biometric_dialog_corner_size"/>
</shape>

11
packages/SystemUI/res/layout/biometric_dialog.xml
View File

@@ -31,7 +31,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="horizontal">
<!-- This is not a Space since Spaces cannot be clicked. The width of this changes depending
on horizontal/portrait orientation -->
@@ -43,11 +44,13 @@
<LinearLayout
android:id="@+id/dialog"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:elevation="2dp"
android:background="@drawable/biometric_dialog_bg">
android:background="@drawable/biometric_dialog_bg"
android:layout_marginBottom="@dimen/biometric_dialog_border_padding"
android:layout_marginLeft="@dimen/biometric_dialog_border_padding"
android:layout_marginRight="@dimen/biometric_dialog_border_padding">
<TextView
android:id="@+id/title"

1
packages/SystemUI/res/values/dimens.xml
View File

@@ -889,6 +889,7 @@
<dimen name="biometric_dialog_biometric_icon_size">64dp</dimen>
<dimen name="biometric_dialog_corner_size">4dp</dimen>
<dimen name="biometric_dialog_animation_translation_offset">350dp</dimen>
<dimen name="biometric_dialog_border_padding">4dp</dimen>
<!-- Wireless Charging Animation values -->
<dimen name="wireless_charging_dots_radius_start">0dp</dimen>

6
packages/SystemUI/src/com/android/systemui/biometrics/BiometricDialogView.java
View File

@@ -42,6 +42,7 @@ import android.widget.TextView;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
import com.android.systemui.util.leak.RotationUtils;
/**
* Abstract base class. Shows a dialog for BiometricPrompt.
@@ -199,7 +200,10 @@ public abstract class BiometricDialogView extends LinearLayout {
final Button negative = mLayout.findViewById(R.id.button2);
final Button positive = mLayout.findViewById(R.id.button1);
mDialog.getLayoutParams().width = (int) mDialogWidth;
if (RotationUtils.getRotation(mContext) != RotationUtils.ROTATION_NONE) {
mDialog.getLayoutParams().width = (int) mDialogWidth;
}
mLastState = STATE_NONE;
updateState(STATE_AUTHENTICATING);