From 905002a01d88a3ff2cb473904706286100858670 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 5 Apr 2016 13:21:52 -0700
Subject: [PATCH] Fix animation when expand conditional notices in Settings.

Bug: 28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2
---
 .../settings/dashboard/conditional/ConditionAdapterUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
index a87b0d028f8..a5d0701a83e 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
@@ -106,7 +106,7 @@ public class ConditionAdapterUtils {
 
     private static void animateChange(final View view, final View content,
             final View detailGroup, final boolean visible) {
-        final int beforeBottom = view.getBottom();
+        final int beforeBottom = content.getBottom();
         setHeight(detailGroup, visible ? LayoutParams.WRAP_CONTENT : 0);
         detailGroup.setVisibility(View.VISIBLE);
         view.addOnLayoutChangeListener(new OnLayoutChangeListener() {
@@ -115,7 +115,7 @@ public class ConditionAdapterUtils {
             @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 = v.getBottom();
+                final int afterBottom = content.getBottom();
                 v.removeOnLayoutChangeListener(this);
                 final ObjectAnimator animator = ObjectAnimator.ofInt(content, "bottom",
                         beforeBottom, afterBottom);