aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-04-17 23:59:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-17 23:59:41 -0700
commit64e87b3e660199b5dd7539fe413146e4dfbf977f (patch)
tree1a9427db419abff635ad245eefd013724ca6c9fd /java/src/com/android/inputmethod/latin/setup/SetupActivity.java
parent8acab80a8680956038b45912d3e00a1d6a5e3cdb (diff)
parent0b2d184a426f49c115ea55098ae6073ccd7d6a94 (diff)
downloadlatinime-64e87b3e660199b5dd7539fe413146e4dfbf977f.tar.gz
latinime-64e87b3e660199b5dd7539fe413146e4dfbf977f.tar.xz
latinime-64e87b3e660199b5dd7539fe413146e4dfbf977f.zip
am 0b2d184a: Merge "Update setup wizard icons"
* commit '0b2d184a426f49c115ea55098ae6073ccd7d6a94': Update setup wizard icons
Diffstat (limited to 'java/src/com/android/inputmethod/latin/setup/SetupActivity.java')
-rw-r--r--java/src/com/android/inputmethod/latin/setup/SetupActivity.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index 099169aa9..e333e4d4f 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -313,10 +313,8 @@ public final class SetupActivity extends Activity {
final int paddingEnd = ViewCompatUtils.getPaddingEnd(mActionLabel);
ViewCompatUtils.setPaddingRelative(mActionLabel, paddingEnd, 0, paddingEnd, 0);
} else {
- final Drawable icon = res.getDrawable(actionIcon);
- icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
- TextViewCompatUtils.setCompoundDrawablesRelative(
- mActionLabel, icon, null, null, null);
+ TextViewCompatUtils.setCompoundDrawablesRelativeWithIntrinsicBounds(
+ mActionLabel, res.getDrawable(actionIcon), null, null, null);
}
}