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

When click conditional's title, expand/collapse content.

Browse Source 
Bug: 30200101

It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.

Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
This commit is contained in:
Fan Zhang
2016-08-11 16:41:29 -07:00
parent d599f43a1c
commit a2db2ca8fa
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/condition_card.xml
View File

@@ -25,7 +25,6 @@
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:paddingStart="16dp"
android:background="?android:attr/colorAccent" android:background="?android:attr/colorAccent"
android:elevation="2dp" android:elevation="2dp"
android:clickable="true" android:clickable="true"
@@ -35,6 +34,7 @@
android:id="@+id/collapsed_group" android:id="@+id/collapsed_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:background="?android:attr/selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:gravity="center"> android:gravity="center">
@@ -42,6 +42,7 @@
android:id="@android:id/icon" android:id="@android:id/icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:tint="?android:attr/textColorPrimaryInverse" /> android:tint="?android:attr/textColorPrimaryInverse" />
@@ -58,10 +59,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="16dp" android:padding="16dp"
android:tint="?android:attr/textColorPrimaryInverse" android:tint="?android:attr/textColorPrimaryInverse"/>
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground" />
</LinearLayout> </LinearLayout>
@@ -69,7 +67,7 @@
android:id="@+id/detail_group" android:id="@+id/detail_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:paddingStart="56dp" android:paddingStart="72dp"
android:visibility="gone" android:visibility="gone"
android:orientation="vertical"> android:orientation="vertical">

7
src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
View File

@@ -68,12 +68,13 @@ public class ConditionAdapterUtils {
card.setOnClickListener(onClickListener); card.setOnClickListener(onClickListener);
view.icon.setImageIcon(condition.getIcon()); view.icon.setImageIcon(condition.getIcon());
view.title.setText(condition.getTitle()); view.title.setText(condition.getTitle());
ImageView expand = (ImageView) view.itemView.findViewById(R.id.expand_indicator); final View collapsedGroup = view.itemView.findViewById(R.id.collapsed_group);
expand.setTag(condition); collapsedGroup.setTag(condition);
final ImageView expand = (ImageView) view.itemView.findViewById(R.id.expand_indicator);
expand.setImageResource(isExpanded ? R.drawable.ic_expand_less : R.drawable.ic_expand_more); expand.setImageResource(isExpanded ? R.drawable.ic_expand_less : R.drawable.ic_expand_more);
expand.setContentDescription(expand.getContext().getString(isExpanded expand.setContentDescription(expand.getContext().getString(isExpanded
? R.string.condition_expand_hide : R.string.condition_expand_show)); ? R.string.condition_expand_hide : R.string.condition_expand_show));
expand.setOnClickListener(onExpandListener); collapsedGroup.setOnClickListener(onExpandListener);
View detailGroup = view.itemView.findViewById(R.id.detail_group); View detailGroup = view.itemView.findViewById(R.id.detail_group);
CharSequence[] actions = condition.getActions(); CharSequence[] actions = condition.getActions();