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

Merge "Fix animation when expand conditional notices in Settings." into nyc-dev

Browse Source
This commit is contained in:
Fan Zhang
2016-04-06 19:07:10 +00:00
committed by Android (Google) Code Review
parent a3d8c316d4 905002a01d
commit df634d03c5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ public class ConditionAdapterUtils {
private static void animateChange(final View view, final View content, private static void animateChange(final View view, final View content,
final View detailGroup, final boolean visible) { final View detailGroup, final boolean visible) {
final int beforeBottom = view.getBottom(); final int beforeBottom = content.getBottom();
setHeight(detailGroup, visible ? LayoutParams.WRAP_CONTENT : 0); setHeight(detailGroup, visible ? LayoutParams.WRAP_CONTENT : 0);
detailGroup.setVisibility(View.VISIBLE); detailGroup.setVisibility(View.VISIBLE);
view.addOnLayoutChangeListener(new OnLayoutChangeListener() { view.addOnLayoutChangeListener(new OnLayoutChangeListener() {
@@ -115,7 +115,7 @@ public class ConditionAdapterUtils {
@Override @Override
public void onLayoutChange(View v, int left, int top, int right, int bottom, public void onLayoutChange(View v, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) { int oldLeft, int oldTop, int oldRight, int oldBottom) {
final int afterBottom = v.getBottom(); final int afterBottom = content.getBottom();
v.removeOnLayoutChangeListener(this); v.removeOnLayoutChangeListener(this);
final ObjectAnimator animator = ObjectAnimator.ofInt(content, "bottom", final ObjectAnimator animator = ObjectAnimator.ofInt(content, "bottom",
beforeBottom, afterBottom); beforeBottom, afterBottom);