Merge "Apply tint when setting check mark drawable" into nyc-dev

am: fff349d

* commit 'fff349ddbaf6d31f7373f854e85f2171adf2ef97':
  Apply tint when setting check mark drawable

Change-Id: I8b7c195ee10fddfa022f95a021fe0c0f60f1e0ec

1 files changed, 5 insertions, 2 deletions

diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index df506ca65da0..21595d15e624 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -185,11 +185,12 @@ public class CheckedTextView extends TextView implements Checkable {
             d.setCallback(this);
             d.setVisible(getVisibility() == VISIBLE, false);
             d.setState(CHECKED_STATE_SET);
-            setMinHeight(d.getIntrinsicHeight());
 
+            // Record the intrinsic dimensions when in "checked" state.
+            setMinHeight(d.getIntrinsicHeight());
             mCheckMarkWidth = d.getIntrinsicWidth();
+
             d.setState(getDrawableState());
-            applyCheckMarkTint();
         } else {
             mCheckMarkWidth = 0;
         }
@@ -197,6 +198,8 @@ public class CheckedTextView extends TextView implements Checkable {
         mCheckMarkDrawable = d;
         mCheckMarkResource = resId;
 
+        applyCheckMarkTint();
+
         // Do padding resolution. This will call internalSetPadding() and do a
         // requestLayout() if needed.
         resolvePadding();