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

Merge "Update GLIF button styles"

Browse Source
This commit is contained in:
Maurice Lam
2017-02-23 02:01:44 +00:00
committed by Android (Google) Code Review
parent eb32ad8779 bdfc27f9ac
commit 0c3fe0eaff
10 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,8 @@
android:layout_weight="1.0" android:layout_weight="1.0"
android:layout_marginStart="?attr/suwMarginSides" android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom" android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
@@ -86,7 +88,9 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1.0"> android:layout_weight="1.0"
android:clipChildren="false"
android:clipToPadding="false">
<!-- confirm / restart buttons --> <!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer" <LinearLayout android:id="@+id/buttonContainer"
@@ -94,6 +98,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->

2
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -40,6 +40,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="?attr/suwMarginSides" android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom" android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView

6
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -36,12 +36,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="?attr/suwMarginSides" android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom" android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
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:clipChildren="false"
android:clipToPadding="false">
<ImageView <ImageView
android:id="@+id/suw_layout_icon" android:id="@+id/suw_layout_icon"

4
res/layout-land/fingerprint_enroll_finish.xml
View File

@@ -36,6 +36,8 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@@ -59,6 +61,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button

4
res/layout/choose_lock_password.xml
View File

@@ -26,6 +26,8 @@
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
@@ -54,6 +56,8 @@
android:id="@+id/bottom_container" android:id="@+id/bottom_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView

6
res/layout/choose_lock_pattern_common.xml
View File

@@ -29,6 +29,8 @@
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<!-- takes up all space above button bar at bottom --> <!-- takes up all space above button bar at bottom -->
@@ -37,6 +39,8 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
@@ -56,6 +60,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left : cancel, or re-try --> <!-- left : cancel, or re-try -->

2
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -75,6 +75,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button

4
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -26,6 +26,8 @@
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<com.android.setupwizardlib.view.RichTextView <com.android.setupwizardlib.view.RichTextView
@@ -44,6 +46,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button

2
res/layout/redaction_interstitial.xml
View File

@@ -28,6 +28,8 @@
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

10
res/values/styles.xml
View File

@@ -259,13 +259,13 @@
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
</style> </style>
<style name="SetupWizardButton.Negative" parent="@android:style/Widget.Material.Button.Borderless.Colored"> <style name="SetupWizardButton.Negative" parent="@style/SuwGlifButton.Secondary">
<item name="android:minWidth">0dp</item> <!-- Negative margin to offset for padding of the button itself. We want the label to be
<item name="android:textAllCaps">false</item> aligned with the text above it -->
<item name="android:theme">@style/AccentColorHighlightBorderlessButton</item> <item name="android:layout_marginStart">-16dp</item>
</style> </style>
<style name="SetupWizardButton.Positive" parent="@android:style/Widget.Material.Button.Colored" /> <style name="SetupWizardButton.Positive" parent="@style/SuwGlifButton.Primary" />
<style name="AccentColorHighlightBorderlessButton"> <style name="AccentColorHighlightBorderlessButton">
<item name="android:colorControlHighlight">?android:attr/colorAccent</item> <item name="android:colorControlHighlight">?android:attr/colorAccent</item>