diff options
| author | Danny Baumann <dannybaumann@web.de> | 2016-02-10 13:08:59 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-02-15 10:08:07 -0800 |
| commit | c584b55146c51feda057bb0faa455f57cda76c8b (patch) | |
| tree | bccaa66e8c56e9315baf6408cce25ac97946352b /src/com/android/camera/PhotoMenu.java | |
| parent | 40bcbea44b82d127cc289ca0967cfc9d353667f6 (diff) | |
| download | android_packages_apps_Snap-c584b55146c51feda057bb0faa455f57cda76c8b.tar.gz android_packages_apps_Snap-c584b55146c51feda057bb0faa455f57cda76c8b.tar.bz2 android_packages_apps_Snap-c584b55146c51feda057bb0faa455f57cda76c8b.zip | |
De-uglify menu.
Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index e38c872c9..4b158590d 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -375,7 +375,7 @@ public class PhotoMenu extends MenuController public void animateFadeIn(final ListView v) { ViewPropertyAnimator vp = v.animate(); - vp.alpha(0.85f).setDuration(ANIMATION_DURATION); + vp.alpha(1f).setDuration(ANIMATION_DURATION); vp.start(); } @@ -869,10 +869,8 @@ public class PhotoMenu extends MenuController onSettingChanged(pref); updateSceneModeIcon(pref); for (View v1 : views) { - v1.setBackgroundResource(R.drawable.scene_mode_view_border); + v1.setActivated(v1 == v); } - View border = v.findViewById(R.id.border); - border.setBackgroundResource(R.drawable.scene_mode_view_border_selected); } } @@ -880,10 +878,8 @@ public class PhotoMenu extends MenuController } }); - View border = layout2.findViewById(R.id.border); - views[j] = border; - if (i == init) - border.setBackgroundResource(R.drawable.scene_mode_view_border_selected); + views[j] = layout2; + layout2.setActivated(i == init); imageView.setImageResource(thumbnails[i]); label.setText(entries[i]); layout.addView(layout2); @@ -1006,19 +1002,16 @@ public class PhotoMenu extends MenuController pref.setValueIndex(j); onSettingChanged(pref); for (View v1 : views) { - v1.setBackground(null); + v1.setActivated(v1 == v); } - ImageView image = (ImageView) v.findViewById(R.id.image); - image.setBackgroundColor(0xff33b5e5); } } return true; } }); - views[j] = imageView; - if (i == init) - imageView.setBackgroundColor(0xff33b5e5); + views[j] = layout2; + layout2.setActivated(i == init); TextView label = (TextView) layout2.findViewById(R.id.label); imageView.setImageResource(thumbnails[i]); label.setText(entries[i]); |