diff options
author | John Hoford <hoford@google.com> | 2013-04-09 20:02:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-09 20:02:07 +0000 |
commit | 5101490b4a54a26620856f1154c31a01ed6cd062 (patch) | |
tree | a0178e2067eb21274393a1c2e5a3e375b79b8895 | |
parent | 753bb8aa56fff425fe16b93be368b9b236e4751f (diff) | |
parent | b990071d1a9b8464c29333a9fac8ae41563f4621 (diff) | |
download | android_packages_apps_Snap-5101490b4a54a26620856f1154c31a01ed6cd062.tar.gz android_packages_apps_Snap-5101490b4a54a26620856f1154c31a01ed6cd062.tar.bz2 android_packages_apps_Snap-5101490b4a54a26620856f1154c31a01ed6cd062.zip |
Merge "ui cleanup" into gb-ub-photos-bryce
-rw-r--r-- | src/com/android/gallery3d/filtershow/controller/StyleChooser.java | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/com/android/gallery3d/filtershow/controller/StyleChooser.java b/src/com/android/gallery3d/filtershow/controller/StyleChooser.java index 201f6613e..3f75839ba 100644 --- a/src/com/android/gallery3d/filtershow/controller/StyleChooser.java +++ b/src/com/android/gallery3d/filtershow/controller/StyleChooser.java @@ -1,14 +1,13 @@ package com.android.gallery3d.filtershow.controller; +import android.app.ActionBar.LayoutParams; import android.content.Context; -import android.content.res.Resources; import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.ScaleDrawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; +import android.widget.ImageButton; +import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; import com.android.gallery3d.R; @@ -25,7 +24,7 @@ public class StyleChooser implements Control, RenderingRequestCaller { protected Editor mEditor; private View mTopView; private int mProcessingButton = 0; - private Vector<Button> mIconButton = new Vector<Button>(); + private Vector<ImageButton> mIconButton = new Vector<ImageButton>(); protected int mLayoutID = R.layout.filtershow_control_style_chooser; @Override @@ -41,8 +40,12 @@ public class StyleChooser implements Control, RenderingRequestCaller { mTopView.setVisibility(View.VISIBLE); int n = mParameter.getNumberOfStyles(); mIconButton.clear(); + LayoutParams lp = new LayoutParams(120, 120); for (int i = 0; i < n; i++) { - Button button = new Button(context); + ImageButton button = new ImageButton(context); + button.setScaleType(ScaleType.CENTER_CROP); + button.setLayoutParams(lp); + button.setBackgroundResource(android.R.color.transparent); mIconButton.add(button); final int buttonNo = i; button.setOnClickListener(new View.OnClickListener() { @@ -83,13 +86,8 @@ public class StyleChooser implements Control, RenderingRequestCaller { } try { - Button button = mIconButton.get(mProcessingButton); - Resources res = mLinearLayout.getContext().getResources(); - BitmapDrawable drawable = new BitmapDrawable(res, bmap); - float scale = 12000 / (float) button.getWidth(); - ScaleDrawable sd = new ScaleDrawable(drawable, 0, scale, scale); - - button.setCompoundDrawablesWithIntrinsicBounds(null, sd, null, null); + ImageButton button = mIconButton.get(mProcessingButton); + button.setImageBitmap(bmap); } catch (Exception e) { return; } |