From f4e3f78fa0806a45a8d46efbbb6c65e074b58237 Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Wed, 25 Sep 2019 11:35:28 +0800
Subject: [PATCH] Fix highlight animation

Set correct from-to color for highlight animation

Fixes: 141535322
Test: visual
Change-Id: I1cec8d57fca1435922ad196a4b314d8cee2be9f0
---
 .../settings/widget/HighlightablePreferenceGroupAdapter.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 313a204e5b6..81dc98b646c 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -160,7 +160,7 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
             return;
         }
         mFadeInAnimated = true;
-        final int colorFrom = Color.WHITE;
+        final int colorFrom = mNormalBackgroundRes;
         final int colorTo = mHighlightColor;
         final ValueAnimator fadeInLoop = ValueAnimator.ofObject(
                 new ArgbEvaluator(), colorFrom, colorTo);
@@ -188,7 +188,7 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
             return;
         }
         int colorFrom = mHighlightColor;
-        int colorTo = Color.WHITE;
+        int colorTo = mNormalBackgroundRes;
 
         v.setTag(R.id.preference_highlighted, false);
         final ValueAnimator colorAnimation = ValueAnimator.ofObject(