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

Merge "Use layout weight attr and scrollview in lock pattern screen."

Browse Source
This commit is contained in:
Lei Yu
2016-10-26 23:29:37 +00:00
committed by Android (Google) Code Review
parent 301fe80fa7 4a1f8a76f3
commit 71b589f2a5
1 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
res/layout/confirm_lock_pattern_base.xml
View File

@@ -29,47 +29,54 @@
android:layout_gravity="top|center_horizontal" android:layout_gravity="top|center_horizontal"
android:paddingTop="@dimen/confirm_credentials_top_padding"> android:paddingTop="@dimen/confirm_credentials_top_padding">
<TextView <ScrollView
style="@android:style/TextAppearance.Material.Headline" android:layout_width="match_parent"
android:id="@+id/headerText" android:layout_height="0dp"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:layout_weight="2">
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/colorAccent"/>
<TextView <LinearLayout
style="@android:style/TextAppearance.Material.Body1" android:layout_width="match_parent"
android:id="@+id/detailsText" android:layout_height="match_parent"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:orientation="vertical">
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginTop="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<Button <TextView
style="@android:style/Widget.Material.Button.Borderless" style="@android:style/TextAppearance.Material.Headline"
android:id="@+id/cancelButton" android:id="@+id/headerText"
android:layout_width="wrap_content" android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_height="wrap_content" android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
android:text="@string/cancel" android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin"
android:layout_marginStart="16dp" android:layout_width="wrap_content"
android:layout_marginEnd="16dp" android:layout_height="wrap_content"
android:layout_marginTop="16dp"/> android:textColor="?android:attr/colorAccent"/>
<View android:layout_width="match_parent" <TextView
android:layout_height="0dp" style="@android:style/TextAppearance.Material.Body1"
android:layout_weight="0.5"/> android:id="@+id/detailsText"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginTop="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<Button
style="@android:style/Widget.Material.Button.Borderless"
android:id="@+id/cancelButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
</LinearLayout>
</ScrollView>
<com.android.internal.widget.LockPatternView <com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern" android:id="@+id/lockPattern"
android:layout_width="312dp" android:layout_width="312dp"
android:layout_height="312dp" android:layout_height="0dp"
android:layout_gravity="center_horizontal" android:layout_weight="3"
android:layout_marginTop="-46dp" android:layout_gravity="center_horizontal"/>
android:layout_marginBottom="-46dp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"