diff options
| author | Danny Baumann <dannybaumann@web.de> | 2016-02-10 13:08:59 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:08:52 +0100 |
| commit | f1e07ddcb86233c0864065f89c5bf68c29e928ce (patch) | |
| tree | 6055c6ae7008a0fb2dfe2eefe7ca14da4a441295 /src/com/android/camera/PhotoMenu.java | |
| parent | 693bf7dcefaf5e18e22d20b44fc5fbf0b2c0bc44 (diff) | |
| download | android_packages_apps_Snap-f1e07ddcb86233c0864065f89c5bf68c29e928ce.tar.gz android_packages_apps_Snap-f1e07ddcb86233c0864065f89c5bf68c29e928ce.tar.bz2 android_packages_apps_Snap-f1e07ddcb86233c0864065f89c5bf68c29e928ce.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 b45f07983..8afd59574 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -457,7 +457,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(); } @@ -1150,10 +1150,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); animateSlideOutPreviewMenu(); } @@ -1162,10 +1160,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); @@ -1301,19 +1297,16 @@ public class PhotoMenu extends MenuController changeFilterModeControlIcon(pref.getValue()); 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]); |