diff options
| author | Alan Viverette <alanv@google.com> | 2014-11-12 17:32:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-12 17:32:31 +0000 |
| commit | 4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea (patch) | |
| tree | 5135b7b1351fe0d6083372ac4b4ccd17f656813d /core/java/android/content | |
| parent | cfefab71b1db5500fa3c294a816a3ccb0990242c (diff) | |
| parent | d9f3fdf45bd3e3b5b02f2d21b6df6598cbaf1c70 (diff) | |
| download | frameworks_base-4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea.zip frameworks_base-4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea.tar.gz frameworks_base-4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea.tar.bz2 | |
Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/ColorStateList.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/ColorStateList.java b/core/java/android/content/res/ColorStateList.java index 3c290f7..68a39d3 100644 --- a/core/java/android/content/res/ColorStateList.java +++ b/core/java/android/content/res/ColorStateList.java @@ -353,7 +353,7 @@ public class ColorStateList implements Parcelable { for (int i = 0; i < inputStates.length; i++) { final int[] inputState = inputStates[i]; for (int j = 0; j < inputState.length; j++) { - if (inputState[i] == state) { + if (inputState[j] == state) { return colorStateList; } } |