diff options
| author | Wei Huang <weih@google.com> | 2011-11-14 09:15:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-14 09:15:29 -0800 |
| commit | dae264eca3e139d73c1b45c511243ef94fc4d9d5 (patch) | |
| tree | 5f617083756b53f9b3cdce2c329d12754e5e5c98 /src/com | |
| parent | c2b3d0008432c06ce43a4d93fa1fde1343a6dc65 (diff) | |
| parent | 006baced4746ddaf31fbd170bcb76abc5f1f8325 (diff) | |
| download | LegacyCamera-dae264eca3e139d73c1b45c511243ef94fc4d9d5.zip LegacyCamera-dae264eca3e139d73c1b45c511243ef94fc4d9d5.tar.gz LegacyCamera-dae264eca3e139d73c1b45c511243ef94fc4d9d5.tar.bz2 | |
Merge "Fix several UI bugs." into ics-mr1
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/ui/AbstractIndicatorButton.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/AbstractIndicatorButton.java b/src/com/android/camera/ui/AbstractIndicatorButton.java index 362becf..fd0f664 100644 --- a/src/com/android/camera/ui/AbstractIndicatorButton.java +++ b/src/com/android/camera/ui/AbstractIndicatorButton.java @@ -44,8 +44,8 @@ public abstract class AbstractIndicatorButton extends RotateImageView implements public AbstractIndicatorButton(Context context) { super(context); - mFadeIn = AnimationUtils.loadAnimation(context, R.anim.grow_fade_in_from_right); - mFadeOut = AnimationUtils.loadAnimation(context, R.anim.shrink_fade_out_from_right); + mFadeIn = AnimationUtils.loadAnimation(context, R.anim.setting_popup_grow_fade_in); + mFadeOut = AnimationUtils.loadAnimation(context, R.anim.setting_popup_shrink_fade_out); HIGHLIGHT_COLOR = context.getResources().getColor(R.color.review_control_pressed_color); setScaleType(ImageView.ScaleType.CENTER); PopupManager.getInstance(context).setOnOtherPopupShowedListener(this); |