diff options
| author | Owen Lin <owenlin@google.com> | 2009-11-20 11:24:05 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2009-11-20 11:24:05 +0800 |
| commit | 471fd0aa7dccebe4ac63e8202ee9227ccb52c83d (patch) | |
| tree | 0bcb5e49816728306362956ff5edfa144ff72d75 /src/com/android/camera/IconIndicator.java | |
| parent | e1706c13d469a163d811e29d33b86cc5d4bf67e9 (diff) | |
| parent | 503560f0dc42d6185c61be06f8060dfd50d30d69 (diff) | |
| download | LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.zip LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.tar.gz LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.tar.bz2 | |
resolved conflicts for merge of 503560f0 to eclair-mr2
Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823
Diffstat (limited to 'src/com/android/camera/IconIndicator.java')
| -rw-r--r-- | src/com/android/camera/IconIndicator.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/camera/IconIndicator.java b/src/com/android/camera/IconIndicator.java index b96f0b8..3d789bc 100644 --- a/src/com/android/camera/IconIndicator.java +++ b/src/com/android/camera/IconIndicator.java @@ -45,7 +45,7 @@ public class IconIndicator extends ImageView { a.recycle(); setModesAndIcons(modes, icons); - setImageDrawable(mIcons.length > 0 ? mIcons[0]: null); + setImageDrawable(mIcons.length > 0 ? mIcons[0] : null); } public IconIndicator(Context context, AttributeSet attrs) { @@ -75,12 +75,7 @@ public class IconIndicator extends ImageView { public void setMode(String mode) { for (int i = 0, n = mModes.length; i < n; ++i) { if (mModes[i].equals(mode)) { - if (mIcons[i] != null) { - setVisibility(View.VISIBLE); - setImageDrawable(mIcons[i]); - } else { - setVisibility(View.GONE); - } + setImageDrawable(mIcons[i]); return; } } |