Merge "Fix crash on tablets"

This commit is contained in:
Jorim Jaggi
2015-04-15 17:56:21 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 8 deletions

View File

@@ -15,14 +15,7 @@
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:paddingTop="48dp"
android:background="#80000000">
<View android:layout_width="328dp"
android:layout_height="match_parent"
android:background="@color/confirm_device_credential_dark_background"
android:layout_gravity="center_horizontal"/>
<include layout="@layout/confirm_lock_pattern_base" <include layout="@layout/confirm_lock_pattern_base"
android:layout_width="328dp" android:layout_width="328dp"

View File

@@ -17,5 +17,7 @@
--> -->
<resources> <resources>
<style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings"> <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
<item name="confirmDeviceCredentialsSideMargin">0dp</item>
<item name="confirmDeviceCredentialsTopMargin">64dp</item>
</style> </style>
</resources> </resources>