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

Merge "Adjust alignment for suggestion icon." into pi-dev

Browse Source 
am: 2d925f45b2

Change-Id: Id29c00047d3a3261f1ef567c56499e44e0973db6
This commit is contained in:
Doris Ling
2018-04-06 16:11:48 -07:00
committed by android-build-merger
parent 11c27313e6 2d925f45b2
commit 137dcb6998
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/layout/suggestion_tile_with_button.xml
View File

@@ -86,15 +86,18 @@
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.SuggestionSummary" /> android:textAppearance="@style/TextAppearance.SuggestionSummary" />
<Button <FrameLayout
android:id="@android:id/primary"
style="@style/ActionPrimaryButton"
android:layout_gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" style="@style/SuggestionCardButton">
android:layout_marginBottom="18dp" <Button
android:text="@string/suggestion_button_text" /> android:id="@android:id/primary"
style="@style/ActionPrimaryButton"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/suggestion_button_text" />
</FrameLayout>
</LinearLayout> </LinearLayout>

4
res/values/dimens.xml
View File

@@ -318,6 +318,10 @@
<dimen name="suggestion_card_inner_margin">12dp</dimen> <dimen name="suggestion_card_inner_margin">12dp</dimen>
<dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen> <dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen>
<dimen name="suggestion_card_corner_radius">2dp</dimen> <dimen name="suggestion_card_corner_radius">2dp</dimen>
<dimen name="suggestion_card_icon_side_margin">12dp</dimen>
<dimen name="suggestion_card_button_side_margin">8dp</dimen>
<dimen name="suggestion_card_button_top_margin">16dp</dimen>
<dimen name="suggestion_card_button_bottom_margin">18dp</dimen>
<!-- Padding for the reset screens --> <!-- Padding for the reset screens -->
<dimen name="reset_checkbox_padding_end">8dp</dimen> <dimen name="reset_checkbox_padding_end">8dp</dimen>

10
res/values/styles.xml
View File

@@ -329,6 +329,16 @@
<style name="SuggestionCardIcon"> <style name="SuggestionCardIcon">
<item name="android:layout_centerHorizontal">false</item> <item name="android:layout_centerHorizontal">false</item>
<item name="android:layout_alignParentStart">true</item> <item name="android:layout_alignParentStart">true</item>
<item name="android:layout_marginStart">@dimen/suggestion_card_icon_side_margin</item>
<item name="android:layout_marginEnd">@dimen/suggestion_card_icon_side_margin</item>
</style>
<style name="SuggestionCardButton">
<item name="android:layout_gravity">start</item>
<item name="android:layout_marginStart">@dimen/suggestion_card_button_side_margin</item>
<item name="android:layout_marginEnd">@dimen/suggestion_card_button_side_margin</item>
<item name="android:layout_marginTop">@dimen/suggestion_card_button_top_margin</item>
<item name="android:layout_marginBottom">@dimen/suggestion_card_button_bottom_margin</item>
</style> </style>
<style name="TextAppearance.SuggestionTitle" <style name="TextAppearance.SuggestionTitle"