diff options
| author | Jack Yoo <jyoo@codeaurora.org> | 2016-01-27 17:09:15 -0800 |
|---|---|---|
| committer | Camera Software Integration <camswint@localhost> | 2016-01-30 13:01:11 -0700 |
| commit | e94a646b72e995ec12b6b9ab5bd3212b3f6e299c (patch) | |
| tree | f3f5c386467f56157f2fb5970d601c3051822fdc /res/layout | |
| parent | 8f30e9a0e0d0a1c55d3409877b5a188885cf5887 (diff) | |
| download | android_packages_apps_Snap-e94a646b72e995ec12b6b9ab5bd3212b3f6e299c.tar.gz android_packages_apps_Snap-e94a646b72e995ec12b6b9ab5bd3212b3f6e299c.tar.bz2 android_packages_apps_Snap-e94a646b72e995ec12b6b9ab5bd3212b3f6e299c.zip | |
SnapdragonCamera: Fix the memory leak on view.
Keep using modules instead of creating.
Don't remove the view without cleaning it.
Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0
CRs-Fixed: 958510
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 9a3a01a86..781ff9ce2 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -13,9 +13,23 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.CameraRootView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_root_frame" android:layout_width="match_parent" android:layout_height="match_parent" > -</com.android.camera.ui.CameraRootView> + <com.android.camera.ui.CameraRootView + android:id="@+id/camera_photo_root" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </com.android.camera.ui.CameraRootView> + <com.android.camera.ui.CameraRootView + android:id="@+id/camera_video_root" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </com.android.camera.ui.CameraRootView> + <com.android.camera.ui.CameraRootView + android:id="@+id/camera_pano_root" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </com.android.camera.ui.CameraRootView> +</FrameLayout> |