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

Merge "Fix highlight animation"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-25 05:33:44 +00:00
committed by Android (Google) Code Review
parent ed332c0829 f4e3f78fa0
commit 1f8eee5798
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/widget/HighlightablePreferenceGroupAdapter.java
View File

@@ -160,7 +160,7 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
return; return;
} }
mFadeInAnimated = true; mFadeInAnimated = true;
final int colorFrom = Color.WHITE; final int colorFrom = mNormalBackgroundRes;
final int colorTo = mHighlightColor; final int colorTo = mHighlightColor;
final ValueAnimator fadeInLoop = ValueAnimator.ofObject( final ValueAnimator fadeInLoop = ValueAnimator.ofObject(
new ArgbEvaluator(), colorFrom, colorTo); new ArgbEvaluator(), colorFrom, colorTo);
@@ -188,7 +188,7 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter
return; return;
} }
int colorFrom = mHighlightColor; int colorFrom = mHighlightColor;
int colorTo = Color.WHITE; int colorTo = mNormalBackgroundRes;
v.setTag(R.id.preference_highlighted, false); v.setTag(R.id.preference_highlighted, false);
final ValueAnimator colorAnimation = ValueAnimator.ofObject( final ValueAnimator colorAnimation = ValueAnimator.ofObject(