diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-17 04:03:10 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-17 04:03:10 -0700 |
| commit | e85e3c64767552461debc0b1989f09033f7e3054 (patch) | |
| tree | bc4323bab807a0a57c7f3d5d6eb5fc45c0c5e87e /java/src | |
| parent | 0206339a2664d1cb05fff3ff20352cf04871bef1 (diff) | |
| parent | 464202047d6813e7559ceb8e73aceae0b15da1d9 (diff) | |
| download | latinime-e85e3c64767552461debc0b1989f09033f7e3054.tar.gz latinime-e85e3c64767552461debc0b1989f09033f7e3054.tar.xz latinime-e85e3c64767552461debc0b1989f09033f7e3054.zip | |
am 46420204: Add user feedback to setup action labels and icons
* commit '464202047d6813e7559ceb8e73aceae0b15da1d9':
Add user feedback to setup action labels and icons
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/setup/SetupActivity.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java index 2ecd260ab..099169aa9 100644 --- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java +++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java @@ -20,7 +20,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Message; @@ -119,7 +118,7 @@ public final class SetupActivity extends Activity { final SetupStep step1 = new SetupStep(findViewById(R.id.setup_step1), appName, R.string.setup_step1_title, R.string.setup_step1_instruction, - R.drawable.ic_settings_language, R.string.setup_step1_action); + R.drawable.ic_setup_step1, R.string.setup_step1_action); step1.setAction(new Runnable() { @Override public void run() { @@ -131,7 +130,7 @@ public final class SetupActivity extends Activity { final SetupStep step2 = new SetupStep(findViewById(R.id.setup_step2), appName, R.string.setup_step2_title, R.string.setup_step2_instruction, - 0 /* actionIcon */, R.string.setup_step2_action); + R.drawable.ic_setup_step2, R.string.setup_step2_action); step2.setAction(new Runnable() { @Override public void run() { @@ -144,7 +143,7 @@ public final class SetupActivity extends Activity { final SetupStep step3 = new SetupStep(findViewById(R.id.setup_step3), appName, R.string.setup_step3_title, R.string.setup_step3_instruction, - R.drawable.sym_keyboard_language_switch, R.string.setup_step3_action); + R.drawable.ic_setup_step3, R.string.setup_step3_action); step3.setAction(new Runnable() { @Override public void run() { @@ -314,9 +313,7 @@ public final class SetupActivity extends Activity { final int paddingEnd = ViewCompatUtils.getPaddingEnd(mActionLabel); ViewCompatUtils.setPaddingRelative(mActionLabel, paddingEnd, 0, paddingEnd, 0); } else { - final int overrideColor = res.getColor(R.color.setup_text_action); final Drawable icon = res.getDrawable(actionIcon); - icon.setColorFilter(overrideColor, PorterDuff.Mode.MULTIPLY); icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight()); TextViewCompatUtils.setCompoundDrawablesRelative( mActionLabel, icon, null, null, null); |