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

Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-12 02:58:28 +00:00
committed by Android (Google) Code Review
parent 482b7feaa7 df055c8655
commit 91ca9f60e9
11 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/condition_tile_new_ui.xml
View File

@@ -19,7 +19,7 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/colorSecondary"
android:background="@color/condition_card_background"
android:orientation="vertical">
<LinearLayout

2
res/layout/search_panel.xml
View File

@@ -24,7 +24,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/material_grey_300">
android:background="@color/suggestion_condition_background">
<android.support.v7.widget.CardView
android:id="@+id/search_bar"
android:layout_width="match_parent"

2
res/layout/settings_main_dashboard.xml
View File

@@ -25,7 +25,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/material_grey_300">
android:background="@color/suggestion_condition_background">
<android.support.v7.widget.CardView
android:id="@+id/search_bar"
android:layout_width="match_parent"

9
res/layout/suggestion_condition_footer.xml
View File

@@ -19,15 +19,16 @@
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuggestionConditionStyle"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_height="44dp"
android:paddingTop="4dp"
android:paddingEnd="16dp"
android:orientation="horizontal"
android:gravity="center|end">
android:gravity="end">
<ImageView
android:id="@+id/collapse_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="16dp"
android:layout_height="wrap_content"
android:src="@drawable/ic_expand_less"/>
</LinearLayout>

114
res/layout/suggestion_condition_header.xml
View File

@@ -15,62 +15,80 @@
limitations under the License.
-->
<RelativeLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuggestionConditionStyle"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_centerHorizontal="true">
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@android:id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_centerVertical="true">
<Space
android:id="@+id/top_space"
android:layout_width="match_parent"
android:layout_height="9dp"/>
<include layout="@layout/condition_header_icon" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_centerHorizontal="true">
</FrameLayout>
<FrameLayout
android:id="@android:id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_centerVertical="true">
<ImageView
android:id="@+id/expand_indicator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:padding="16dp"
android:src="@drawable/ic_expand_more"/>
<include layout="@layout/condition_header_icon" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_toStartOf="@id/expand_indicator"
android:layout_centerVertical="true"
android:gravity="end"
android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent" />
</FrameLayout>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@android:id/icon_frame"
android:layout_toStartOf="@android:id/summary"
android:layout_centerVertical="true"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent" />
<ImageView
android:id="@+id/expand_indicator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:paddingTop="4dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:src="@drawable/ic_expand_more"/>
<LinearLayout
android:id="@+id/additional_icons"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toStartOf="@android:id/summary"
android:layout_toEndOf="@android:id/icon_frame"
android:orientation="horizontal"
android:gravity="center_vertical"/>
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_toStartOf="@id/expand_indicator"
android:layout_centerVertical="true"
android:gravity="end"
android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent" />
</RelativeLayout>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@android:id/icon_frame"
android:layout_toStartOf="@android:id/summary"
android:layout_centerVertical="true"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.SuggestionTitle"
android:textColor="?android:attr/colorAccent" />
<LinearLayout
android:id="@+id/additional_icons"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toStartOf="@android:id/summary"
android:layout_toEndOf="@android:id/icon_frame"
android:orientation="horizontal"
android:gravity="center_vertical"/>
</RelativeLayout>
<Space
android:layout_width="match_parent"
android:layout_height="12dp"/>
</LinearLayout>