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

Merge "Fix sizing of pattern view" into oc-mr1-dev

Browse Source 
am: adef5b23e0

Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
This commit is contained in:
Maurice Lam
2017-09-11 20:09:55 +00:00
committed by android-build-merger
parent 707552888d adef5b23e0
commit 4f61cfb967
5 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout-land/choose_lock_pattern.xml
View File

@@ -138,10 +138,12 @@
</LinearLayout> </LinearLayout>
<!-- right side: lock pattern --> <!-- right side: lock pattern -->
<FrameLayout <com.android.setupwizardlib.view.FillContentLayout
style="@style/LockPatternContainerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.0"> android:layout_weight="1.0"
android:paddingStart="0dp">
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -149,7 +151,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/lock_pattern_background" /> android:background="@color/lock_pattern_background" />
</FrameLayout> </com.android.setupwizardlib.view.FillContentLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

8
res/layout-land/confirm_lock_pattern_internal.xml
View File

@@ -96,10 +96,12 @@
</ScrollView> </ScrollView>
<FrameLayout <com.android.setupwizardlib.view.FillContentLayout
style="@style/LockPatternContainerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1"
android:paddingStart="0dp">
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -107,7 +109,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/lock_pattern_background" /> android:background="@color/lock_pattern_background" />
</FrameLayout> </com.android.setupwizardlib.view.FillContentLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout> </com.android.setupwizardlib.GlifLayout>

22
res/layout/choose_lock_pattern_common.xml
View File

@@ -64,19 +64,31 @@
android:gravity="center" android:gravity="center"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical"
android:paddingLeft="0dp"
android:paddingRight="0dp">
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minLines="2" android:minLines="2"
android:gravity="center" android:gravity="center"
android:paddingHorizontal="?attr/suwMarginSides"
android:textSize="18sp" /> android:textSize="18sp" />
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" <com.android.setupwizardlib.view.FillContentLayout
android:layout_width="match_parent" style="@style/LockPatternContainerStyle"
android:layout_height="0dip" android:layout_width="wrap_content"
android:layout_weight="1" /> android:layout_height="0dp"
android:layout_weight="1">
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
</LinearLayout> </LinearLayout>

25
res/layout/confirm_lock_pattern_internal_base.xml
View File

@@ -61,14 +61,23 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:gravity="center"> android:gravity="center"
android:paddingLeft="0dp"
android:paddingRight="0dp">
<com.android.internal.widget.LockPatternView <com.android.setupwizardlib.view.FillContentLayout
android:id="@+id/lockPattern" style="@style/LockPatternContainerStyle"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="4" android:layout_weight="1">
android:layout_gravity="center_horizontal"/>
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
<TextView <TextView
style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText" style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
@@ -77,9 +86,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="?attr/suwMarginSides"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:gravity="center_vertical"/> android:gravity="center_vertical"/>
<ImageView <ImageView
@@ -87,6 +95,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="?attr/suwMarginSides"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:contentDescription="@string/confirm_fingerprint_icon_content_description" android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/> android:visibility="gone"/>

10
res/values/styles.xml
View File

@@ -425,6 +425,16 @@
<style name="DreamStartButton" parent="android:Widget.Material.Button" /> <style name="DreamStartButton" parent="android:Widget.Material.Button" />
<style name="LockPatternContainerStyle">
<item name="android:maxHeight">400dp</item>
<item name="android:maxWidth">420dp</item>
<item name="android:minHeight">0dp</item>
<item name="android:minWidth">0dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:paddingHorizontal">44dp</item>
<item name="android:paddingTop">0dp</item>
</style>
<style name="LockPatternStyle"> <style name="LockPatternStyle">
<item name="*android:regularColor">@color/lock_pattern_view_regular_color</item> <item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>
<item name="*android:successColor">@color/lock_pattern_view_success_color</item> <item name="*android:successColor">@color/lock_pattern_view_success_color</item>