From c91c20c99b819ffe73dd6fc14a7e61523be88861 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 9 Jan 2017 09:09:00 +0100
Subject: Fix camera controls rotation.

Change-Id: I949b30becc8b69268ff30a0dca57e234fd078204
---
 src/com/android/camera/ui/CameraControls.java | 21 +++++++++++++--------
 1 file 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) {
-- 
cgit v1.2.3