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

Merge "Update the layout of contextual card dismissal view"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-16 07:34:49 +00:00
committed by Android (Google) Code Review
parent 1c3ed19a09 84acc5666d
commit 7109b9a68b
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/layout/homepage_dismissal_view.xml
View File

@@ -26,31 +26,32 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/homepage_card_padding_start" android:layout_marginStart="@dimen/homepage_card_dismissal_side_margin"
android:layout_marginTop="@dimen/homepage_card_padding_start" android:layout_marginTop="@dimen/homepage_card_dismissal_margin_top"
android:text="@string/contextual_card_dismiss_confirm_message" android:text="@string/contextual_card_dismiss_confirm_message"
android:textAppearance="@style/TextAppearance.ContextualCardDismissalText"/> android:textAppearance="@style/TextAppearance.ContextualCardDismissalText"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="bottom|end">
<Button
android:id="@+id/keep"
style="@style/ContextualCardDismissalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom" android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"
android:text="@string/contextual_card_dismiss_keep"/> android:gravity="bottom|end">
<Button <Button
android:id="@+id/remove" android:id="@+id/remove"
style="@style/ContextualCardDismissalButton" style="@style/ContextualCardDismissalButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"
android:text="@string/contextual_card_dismiss_remove"/> android:text="@string/contextual_card_dismiss_remove"/>
<Button
android:id="@+id/keep"
style="@style/ContextualCardDismissalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_dismissal_button_side_margin"
android:layout_marginEnd="@dimen/homepage_card_dismissal_button_side_margin"
android:text="@string/contextual_card_dismiss_keep"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

5
res/values/dimens.xml
View File

@@ -332,7 +332,12 @@
<dimen name="homepage_half_card_padding_top">12dp</dimen> <dimen name="homepage_half_card_padding_top">12dp</dimen>
<dimen name="homepage_half_card_padding_bottom">16dp</dimen> <dimen name="homepage_half_card_padding_bottom">16dp</dimen>
<dimen name="homepage_half_card_title_margin_top">12dp</dimen> <dimen name="homepage_half_card_title_margin_top">12dp</dimen>
<!-- Homepage dismissal cards size and padding -->
<dimen name="homepage_card_dismissal_margin_top">16dp</dimen>
<dimen name="homepage_card_dismissal_margin_bottom">2dp</dimen> <dimen name="homepage_card_dismissal_margin_bottom">2dp</dimen>
<dimen name="homepage_card_dismissal_side_margin">16dp</dimen>
<dimen name="homepage_card_dismissal_button_side_margin">6dp</dimen>
<!-- Horizontal divider size and margin --> <!-- Horizontal divider size and margin -->
<dimen name="horizontal_divider_margin_top">4dp</dimen> <dimen name="horizontal_divider_margin_top">4dp</dimen>

1
res/values/styles.xml
View File

@@ -460,6 +460,7 @@
<style name="ContextualCardDismissalButton" <style name="ContextualCardDismissalButton"
parent="android:Widget.DeviceDefault.Button.Borderless.Colored"> parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
<item name="android:minWidth">10dp</item>
<item name="android:minHeight">16dp</item> <item name="android:minHeight">16dp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>