83a6621b38
- Add a flag in dashboard feature provider to specify whether to use the combined UI for suggestions and conditions. - Move Conditions below Suggestions. - Add dashboard entity for condition and suggestion container, and wrap the condition and suggestion list inside the container. The container itself will be a single dashboard item, and within it will be the list of suggestion or condition. - Add suggestion/condition header that will show the combined info for the conditions and suggestion data, and have the expand button to control expanding both the suggestion and condition list. - Change the individual condition card to be always expanded, and remove the logic to collapse/expand individual condition card. - Remove the divider between the action button and condition detail within each condition card. - Add suggestion/condition footer for collapsing the whole suggestion and condition list. Bug: 37645754 Test: make RunSettingsRoboTests Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
77 lines
2.7 KiB
XML
77 lines
2.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<RelativeLayout
|
|
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">
|
|
|
|
<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">
|
|
|
|
<include layout="@layout/condition_header_icon" />
|
|
|
|
</FrameLayout>
|
|
|
|
<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"/>
|
|
|
|
<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" />
|
|
|
|
<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>
|