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

Merge "Work challenge background: Fix top padding" into nyc-dev

Browse Source 
am: 4873230

* commit '487323032638e733d9cec4608838b7727b99232f':
  Work challenge background: Fix top padding
This commit is contained in:
Abodunrinwa Toki
2016-03-18 15:37:08 +00:00
committed by android-build-merger
parent 2aca50b657 4873230326
commit 153ce15c31
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout-sw600dp/confirm_lock_password.xml
View File

@@ -16,8 +16,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="48dp">
android:layout_height="match_parent">
<include layout="@layout/confirm_lock_password_base"
android:layout_width="match_parent"

3
res/layout/confirm_lock_password_base.xml
View File

@@ -26,7 +26,8 @@
android:orientation="vertical"
android:layout_width="@dimen/confirm_credentials_layout_width"
android:layout_height="match_parent"
android:layout_gravity="top|center_horizontal">
android:layout_gravity="top|center_horizontal"
android:paddingTop="@dimen/confirm_credentials_top_padding">
<TextView
style="@android:style/TextAppearance.Material.Headline"

3
res/layout/confirm_lock_pattern_base.xml
View File

@@ -26,7 +26,8 @@
android:orientation="vertical"
android:layout_width="@dimen/confirm_credentials_layout_width"
android:layout_height="match_parent"
android:layout_gravity="top|center_horizontal">
android:layout_gravity="top|center_horizontal"
android:paddingTop="@dimen/confirm_credentials_top_padding">
<TextView
style="@android:style/TextAppearance.Material.Headline"

1
res/values-sw600dp/dimens.xml
View File

@@ -74,5 +74,6 @@
<dimen name="confirm_credentials_security_method_margin">72dp</dimen>
<dimen name="confirm_credentials_layout_width">328dp</dimen>
<dimen name="confirm_credentials_top_padding">48dp</dimen>
<dimen name="fab_margin">24dp</dimen>
</resources>

1
res/values/dimens.xml
View File

@@ -235,6 +235,7 @@
<dimen name="confirm_credentials_security_method_margin">48dp</dimen>
<dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>
<dimen name="confirm_credentials_top_padding">0dp</dimen>
<dimen name="fab_size">56dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="fab_elevation">12dp</dimen>