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 | |
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')
-rw-r--r-- | src/com/android/camera/PhotoMenu.java | 21 | ||||
-rw-r--r-- | src/com/android/camera/PhotoUI.java | 5 | ||||
-rw-r--r-- | src/com/android/camera/VideoMenu.java | 11 | ||||
-rw-r--r-- | src/com/android/camera/VideoUI.java | 4 | ||||
-rw-r--r-- | src/com/android/camera/ui/ListMenu.java | 7 |
5 files changed, 18 insertions, 30 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]); diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 926550049..b00db1434 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -837,8 +837,9 @@ public class PhotoUI implements PieListener, mMenu.animateSlideIn(mMenuLayout, CameraActivity.SETTING_LIST_WIDTH_1, true); if (level == 2) mMenu.animateFadeIn(popup); - } else - popup.setAlpha(0.85f); + } else { + popup.setAlpha(1f); + } } public void removeLevel2() { diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java index 3e43ff26d..5abb727ee 100644 --- a/src/com/android/camera/VideoMenu.java +++ b/src/com/android/camera/VideoMenu.java @@ -310,7 +310,7 @@ public class VideoMenu 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(); } @@ -618,10 +618,8 @@ public class VideoMenu extends MenuController if (System.currentTimeMillis() - startTime < CLICK_THRESHOLD) { pref.setValueIndex(j); for (View v1 : views) { - v1.setBackground(null); + v1.setActivated(v1 == v); } - ImageView image = (ImageView) v.findViewById(R.id.image); - image.setBackgroundColor(0xff33b5e5); onSettingChanged(pref); } @@ -630,9 +628,8 @@ public class VideoMenu extends MenuController } }); - 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]); diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index d5255ccbe..778e067a2 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -796,9 +796,9 @@ public class VideoUI implements PieRenderer.PieListener, mVideoMenu.animateSlideIn(mMenuLayout, CameraActivity.SETTING_LIST_WIDTH_1, true); if (level == 2) mVideoMenu.animateFadeIn(popup); + } else { + popup.setAlpha(1f); } - else - popup.setAlpha(0.85f); } public ViewGroup getMenuLayout() { diff --git a/src/com/android/camera/ui/ListMenu.java b/src/com/android/camera/ui/ListMenu.java index 64bdc342b..2de32b28f 100644 --- a/src/com/android/camera/ui/ListMenu.java +++ b/src/com/android/camera/ui/ListMenu.java @@ -124,7 +124,6 @@ public class ListMenu extends ListView ArrayAdapter<ListPreference> mListItemAdapter = new MoreSettingAdapter(); setAdapter(mListItemAdapter); setOnItemClickListener(this); - setSelector(android.R.color.transparent); // Initialize mEnabled mEnabled = new boolean[mListItem.size()]; for (int i = 0; i < mEnabled.length; i++) { @@ -184,10 +183,8 @@ public class ListMenu extends ListView public void resetHighlight() { int count = getChildCount(); for (int i = 0; i < count; i++) { - View v = getChildAt(i); - v.setBackground(null); + getChildAt(i).setActivated(false); } - } @Override @@ -205,7 +202,7 @@ public class ListMenu extends ListView if (mListener != null) { resetHighlight(); ListPreference pref = mListItem.get(position); - view.setBackgroundColor(getContext().getResources().getColor(R.color.setting_color)); + view.setActivated(true); mListener.onPreferenceClicked(pref, (int) view.getY()); } |