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

Remove animateChange in ConditionAdapterUtils

Browse Source 
Bug: 30319913
Test: make RunSettingsRoboTests

Change-Id: Iea3fa574c4f0f80e70a6360b5b4a5f748a80a899
This commit is contained in:
jackqdyulei
2016-10-24 11:12:19 -07:00
parent 9895344be6
commit 8e5f66ce39
3 changed files with 84 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,9 +81,17 @@ public class ConditionAdapterUtils {
View detailGroup = view.itemView.findViewById(R.id.detail_group);
CharSequence[] actions = condition.getActions();
if (isExpanded != (detailGroup.getVisibility() == View.VISIBLE)) {
animateChange(view.itemView, view.itemView.findViewById(R.id.content),
detailGroup, isExpanded, actions.length > 0);
if (isExpanded) {
final boolean hasButtons = actions.length > 0;
setViewVisibility(detailGroup, R.id.divider, hasButtons);
setViewVisibility(detailGroup, R.id.buttonBar, hasButtons);
detailGroup.setVisibility(View.VISIBLE);
} else {
detailGroup.setVisibility(View.GONE);
}
}
if (isExpanded) {
view.summary.setText(condition.getSummary());
for (int i = 0; i < 2; i++) {
@@ -110,37 +118,6 @@ public class ConditionAdapterUtils {
}
}
private static void animateChange(final View view, final View content,
final View detailGroup, final boolean visible, final boolean hasButtons) {
setViewVisibility(detailGroup, R.id.divider, hasButtons);
setViewVisibility(detailGroup, R.id.buttonBar, hasButtons);
final int beforeBottom = content.getBottom();
setHeight(detailGroup, visible ? LayoutParams.WRAP_CONTENT : 0);
detailGroup.setVisibility(View.VISIBLE);
view.addOnLayoutChangeListener(new OnLayoutChangeListener() {
public static final long DURATION = 250;
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) {
final int afterBottom = content.getBottom();
v.removeOnLayoutChangeListener(this);
final ObjectAnimator animator = ObjectAnimator.ofInt(content, "bottom",
beforeBottom, afterBottom);
animator.setDuration(DURATION);
animator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
if (!visible) {
detailGroup.setVisibility(View.GONE);
}
}
});
animator.start();
}
});
}
private static void setHeight(View detailGroup, int height) {
final LayoutParams params = detailGroup.getLayoutParams();
params.height = height;