diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-14 21:01:35 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-04-09 10:35:50 -0700 |
| commit | fb0636179335a7786ec2c0edf9889a55596db126 (patch) | |
| tree | 1db003d56658bdede651750aeb5fbb550371e271 /src/com/android/camera/PhotoMenu.java | |
| parent | b1c75f6028ecbf7bd05f945c542da0f848bc594b (diff) | |
| download | android_packages_apps_Gallery2-fb0636179335a7786ec2c0edf9889a55596db126.tar.gz android_packages_apps_Gallery2-fb0636179335a7786ec2c0edf9889a55596db126.tar.bz2 android_packages_apps_Gallery2-fb0636179335a7786ec2c0edf9889a55596db126.zip | |
Work in progress - Put preview in TextureView
Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener
Ongoing: secure album, aspect ratio for video recording on ICS
Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index f9400fc99..f5ba733c9 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -51,11 +51,13 @@ public class PhotoMenu extends PieController private MoreSettingPopup mPopup; // Second level popup private AbstractSettingPopup mSecondPopup; + private CameraActivity mActivity; public PhotoMenu(CameraActivity activity, PhotoUI ui, PieRenderer pie) { super(activity, pie); mUI = ui; mSettingOff = activity.getString(R.string.setting_off_value); + mActivity = activity; } public void initialize(PreferenceGroup group) { |