diff options
| author | Bart Sears <bsears@google.com> | 2012-10-11 21:14:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 21:14:37 -0700 |
| commit | 017065fa1e05885146cbb044fcd1f3de3f3f69e0 (patch) | |
| tree | bd2375cd91c0bd3c6a7797742b5934f7b9aa8775 | |
| parent | fcb0f67b0e07eee4e6c45f8a68815930b5cdd584 (diff) | |
| parent | 7d161351c5aac3f88eb61003d56f30275ad4a180 (diff) | |
| download | android_packages_apps_Gallery2-017065fa1e05885146cbb044fcd1f3de3f3f69e0.tar.gz android_packages_apps_Gallery2-017065fa1e05885146cbb044fcd1f3de3f3f69e0.tar.bz2 android_packages_apps_Gallery2-017065fa1e05885146cbb044fcd1f3de3f3f69e0.zip | |
am 7d161351: Adjust text on Apply button
* commit '7d161351c5aac3f88eb61003d56f30275ad4a180':
Adjust text on Apply button
| -rw-r--r-- | res/layout/filtershow_activity.xml | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/PanelController.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index f2b4736b6..f9d04aacc 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -189,10 +189,9 @@ android:layout_gravity="center" android:layout_weight="1" android:background="@android:color/transparent" - android:textAllCaps="true" android:gravity="center" android:text="@string/apply_effect" - android:textSize="24dip" /> + android:textSize="18dip" /> </LinearLayout> <HorizontalScrollView diff --git a/src/com/android/gallery3d/filtershow/PanelController.java b/src/com/android/gallery3d/filtershow/PanelController.java index fe2be563f..f13cdd497 100644 --- a/src/com/android/gallery3d/filtershow/PanelController.java +++ b/src/com/android/gallery3d/filtershow/PanelController.java @@ -142,10 +142,10 @@ public class PanelController implements OnClickListener { public void updateText() { String apply = mContext.getString(R.string.apply_effect); if (mShowParameterValue) { - mTextView.setText(Html.fromHtml(apply + ": " + mEffectName + " " + mTextView.setText(Html.fromHtml(apply + " " + mEffectName + " " + mParameterValue)); } else { - mTextView.setText(Html.fromHtml(apply + ": " + mEffectName)); + mTextView.setText(Html.fromHtml(apply + " " + mEffectName)); } } |