diff options
author | Danny Baumann <dannybaumann@web.de> | 2017-01-09 09:09:00 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-01-13 00:11:32 +0100 |
commit | c91c20c99b819ffe73dd6fc14a7e61523be88861 (patch) | |
tree | 315e475d7671ea2a904e0fbc23188a6aec02b772 /src/com/android/camera | |
parent | 3850dbfc1086d87e7f3d010ded272d1580e68b3b (diff) | |
download | android_packages_apps_Snap-c91c20c99b819ffe73dd6fc14a7e61523be88861.tar.gz android_packages_apps_Snap-c91c20c99b819ffe73dd6fc14a7e61523be88861.tar.bz2 android_packages_apps_Snap-c91c20c99b819ffe73dd6fc14a7e61523be88861.zip |
Fix camera controls rotation.
Change-Id: I949b30becc8b69268ff30a0dca57e234fd078204
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 674cb03f7..f06c14d1b 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -199,14 +199,8 @@ public class CameraControls extends RotatableLayout { } synchronized (mViews) { - for (int i = 0; i < mTopBar.getChildCount(); i++) { - mViews.add(mTopBar.getChildAt(i)); - } - - for (int i = 0; i < mBottomBar.getChildCount(); i++) { - mViews.add(mBottomBar.getChildAt(i)); - } - + addChildViewsRecursivelyLocked(mTopBar); + addChildViewsRecursivelyLocked(mBottomBar); mViews.add(mAutoHdrNotice); mViews.add(mHistogramView); } @@ -252,6 +246,17 @@ public class CameraControls extends RotatableLayout { } } + private void addChildViewsRecursivelyLocked(View view) { + if (view instanceof ViewGroup) { + final ViewGroup group = (ViewGroup) view; + for (int i = 0; i < group.getChildCount(); i++) { + addChildViewsRecursivelyLocked(group.getChildAt(i)); + } + } else { + mViews.add(view); + } + } + private ShutterButton.OnShutterButtonListener mShutterListener = new ShutterButton.OnShutterButtonListener() { @Override public void onShutterButtonFocus(boolean pressed) { |