summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-02-10 13:08:59 +0100
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 21:57:47 +0200
commit3d8cfc56712f2572ffa8a852b8a4a480e4edc500 (patch)
treeea60318c9b7088e6ad20d06bf6893110044d1273 /src/com/android/camera/ui
parente0579901aa6dd58979f1f8e68f8f63dd1eedafdd (diff)
downloadandroid_packages_apps_Snap-3d8cfc56712f2572ffa8a852b8a4a480e4edc500.tar.gz
android_packages_apps_Snap-3d8cfc56712f2572ffa8a852b8a4a480e4edc500.tar.bz2
android_packages_apps_Snap-3d8cfc56712f2572ffa8a852b8a4a480e4edc500.zip
De-uglify menu.
Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r--src/com/android/camera/ui/CameraControls.java6
-rw-r--r--src/com/android/camera/ui/ListMenu.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 881225995..4d608a4bb 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -1005,8 +1005,10 @@ public class CameraControls extends RotatableLayout {
};
for (View v : views) {
if (v != null) {
- ((RotateImageView) v).setOrientation(orientation,
- animation);
+ if (v instanceof RotateImageView) {
+ ((RotateImageView) v).setOrientation(orientation,
+ animation);
+ }
}
}
layoutRemaingPhotos();
diff --git a/src/com/android/camera/ui/ListMenu.java b/src/com/android/camera/ui/ListMenu.java
index cda758b9c..1e9d436a8 100644
--- a/src/com/android/camera/ui/ListMenu.java
+++ b/src/com/android/camera/ui/ListMenu.java
@@ -182,7 +182,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++) {
@@ -242,8 +241,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;
}
@@ -264,7 +262,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());
}