summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2011-11-02 19:17:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-02 19:17:09 -0700
commit1f56f129d65729705326f4d6852d760e6a5cacf5 (patch)
tree05b7dc036188174998b1134bfacc8a88fcf5766c
parent8e28d7356e181edc4c45cb3da6bfcd5f61fbaf92 (diff)
parenta18e1141ed70a052d257a641c9a8b6f152a81d95 (diff)
downloadpackages_apps_LegacyCamera-1f56f129d65729705326f4d6852d760e6a5cacf5.zip
packages_apps_LegacyCamera-1f56f129d65729705326f4d6852d760e6a5cacf5.tar.gz
packages_apps_LegacyCamera-1f56f129d65729705326f4d6852d760e6a5cacf5.tar.bz2
Merge "Back to the first-level when recording on Tablet." into ics-mr1
-rw-r--r--src/com/android/camera/ui/IndicatorControlWheel.java16
-rw-r--r--src/com/android/camera/ui/IndicatorControlWheelContainer.java2
2 files changed, 14 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/IndicatorControlWheel.java b/src/com/android/camera/ui/IndicatorControlWheel.java
index 2d6c5c9..5f3d82a 100644
--- a/src/com/android/camera/ui/IndicatorControlWheel.java
+++ b/src/com/android/camera/ui/IndicatorControlWheel.java
@@ -135,9 +135,7 @@ public class IndicatorControlWheel extends IndicatorControl implements
}
}
- @Override
- public void onClick(View view) {
- if (view == mZoomIcon) return;
+ private void changeIndicatorsLevel() {
mPressedIndex = -1;
dismissSettingPopup();
mInAnimation = true;
@@ -145,6 +143,12 @@ public class IndicatorControlWheel extends IndicatorControl implements
requestLayout();
}
+ @Override
+ public void onClick(View view) {
+ if (view == mZoomIcon) return;
+ changeIndicatorsLevel();
+ }
+
public void initialize(Context context, PreferenceGroup group,
boolean isZoomSupported, String[] keys, String[] otherSettingKeys) {
mShutterButtonRadius = IndicatorControlWheelContainer.SHUTTER_BUTTON_RADIUS;
@@ -493,4 +497,10 @@ public class IndicatorControlWheel extends IndicatorControl implements
invalidate();
}
}
+
+ public void dismissSecondLevelIndicator() {
+ if (mCurrentLevel == 1) {
+ changeIndicatorsLevel();
+ }
+ }
}
diff --git a/src/com/android/camera/ui/IndicatorControlWheelContainer.java b/src/com/android/camera/ui/IndicatorControlWheelContainer.java
index 29074c2..a10136b 100644
--- a/src/com/android/camera/ui/IndicatorControlWheelContainer.java
+++ b/src/com/android/camera/ui/IndicatorControlWheelContainer.java
@@ -223,6 +223,6 @@ public class IndicatorControlWheelContainer extends IndicatorControlContainer {
@Override
public void dismissSecondLevelIndicator() {
- // TODO: back to first-level indicator set.
+ mIndicatorControlWheel.dismissSecondLevelIndicator();
}
}