De-uglify menu.

Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761

6 files changed, 19 insertions, 36 deletions

diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 4abab3a03..64d72700a 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -453,7 +453,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();
     }
 
@@ -1072,10 +1072,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();
                         }
 
@@ -1084,10 +1082,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);
@@ -1223,19 +1219,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]);
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 7c312e155..e3efacd9f 100755
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -830,8 +830,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/SceneModeActivity.java b/src/com/android/camera/SceneModeActivity.java
index 9e0e59506..b32a55eb0 100644
--- a/src/com/android/camera/SceneModeActivity.java
+++ b/src/com/android/camera/SceneModeActivity.java
@@ -222,7 +222,6 @@ class MyPagerAdapter extends PagerAdapter {
                         v.setBackground(null);
                     }
                 }
-                view.setBackgroundResource(R.drawable.scene_mode_view_border_selected);
                 SettingsManager.getInstance().setValueIndex(SettingsManager.KEY_SCENE_MODE, index);
                 mActivity.finish();
             }
@@ -293,9 +292,6 @@ class GridAdapter extends BaseAdapter {
         int idx = position + mPage * mActivity.getElmentPerPage();
         viewHolder.imageView.setImageResource(mActivity.getThumbnails()[idx]);
         viewHolder.textTitle.setText(mActivity.getEntries()[position + mPage * mActivity.getElmentPerPage()]);
-        if (idx == mActivity.getCurrentScene()) {
-            view.setBackgroundResource(R.drawable.scene_mode_view_border_selected);
-        }
 
         return view;
     }
diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 0bf6a140f..5838bf677 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -321,7 +321,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();
     }
 
@@ -628,10 +628,8 @@ public class VideoMenu extends MenuController
                             pref.setValueIndex(j);
                             changeFilterModeControlIcon(pref.getValue());
                             for (View v1 : views) {
-                                v1.setBackground(null);
+                                v1.setActivated(v1 == v);
                             }
-                            ImageView image = (ImageView) v.findViewById(R.id.image);
-                            image.setBackgroundColor(0xff33b5e5);
                             onSettingChanged(pref);
                         }
 
@@ -640,9 +638,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 5e74ab940..3e24f8510 100755
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -892,9 +892,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 1810b3eff..88ad8fe2f 100644
--- a/src/com/android/camera/ui/ListMenu.java
+++ b/src/com/android/camera/ui/ListMenu.java
@@ -120,8 +120,7 @@ public class ListMenu extends ListView
                         + " position " + position);
             }
             if (position == mHighlighted)
-                view.setBackgroundColor(getContext().getResources()
-                        .getColor(R.color.setting_color));
+                view.setActivated(true);
             return view;
         }
 
@@ -160,7 +159,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++) {
@@ -183,7 +181,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++) {
@@ -243,8 +240,7 @@ 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);
         }
         mHighlighted = -1;
     }
@@ -265,7 +261,7 @@ public class ListMenu extends ListView
             resetHighlight();
             ListPreference pref = mListItem.get(position);
             mHighlighted = position;
-            view.setBackgroundColor(getContext().getResources().getColor(R.color.setting_color));
+            view.setActivated(true);
             mListener.onPreferenceClicked(pref, (int) view.getY());
         }