PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pattern entry views should be consistent" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-23 00:24:13 +00:00
committed by Android (Google) Code Review
parent e040ef4a39 e4cfb6a594
commit a6b67d15eb
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
res/layout/confirm_lock_pattern_internal_base.xml
View File

@@ -56,33 +56,42 @@
</LinearLayout> </LinearLayout>
<com.android.internal.widget.LockPatternView <LinearLayout
android:id="@+id/lockPattern" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"
android:layout_gravity="center_horizontal"/>
<TextView
style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
android:accessibilityLiveRegion="polite"
android:id="@+id/errorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:orientation="vertical"
android:layout_marginTop="12dp" android:gravity="center">
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"/>
<ImageView <com.android.internal.widget.LockPatternView
android:id="@+id/fingerprintIcon" android:id="@+id/lockPattern"
android:layout_gravity="center_horizontal" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="0dp"
android:layout_height="wrap_content" android:layout_weight="4"
android:layout_marginBottom="24dp" android:layout_gravity="center_horizontal"/>
android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/> <TextView
style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
android:accessibilityLiveRegion="polite"
android:id="@+id/errorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"/>
<ImageView
android:id="@+id/fingerprintIcon"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/>
</LinearLayout>
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"