diff options
| author | Owen Lin <owenlin@google.com> | 2010-04-20 11:14:44 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2010-04-21 15:32:59 +0800 |
| commit | f00d421845b4ff2eca1354419889886fec5f2538 (patch) | |
| tree | fb6632a67f297d5439c6032522f0b8605dec4264 /res/layout | |
| parent | e5864ac46b5a776c29d6b5a47b14c6fa13070d59 (diff) | |
| download | LegacyCamera-f00d421845b4ff2eca1354419889886fec5f2538.zip LegacyCamera-f00d421845b4ff2eca1354419889886fec5f2538.tar.gz LegacyCamera-f00d421845b4ff2eca1354419889886fec5f2538.tar.bz2 | |
Remove GLRootView in onPause() and put it back in onResume() to avoid OOM in
Gallery.
Bug: 2557840
Change-Id: I2d6ff6da25bfe342472278efd5fc25c38d5fd5ce
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 4 | ||||
| -rw-r--r-- | res/layout/video_camera.xml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 1a451f4..94613e7 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -36,10 +36,6 @@ android:id="@+id/focus_rectangle" android:layout_width="match_parent" android:layout_height="match_parent"/> - <com.android.camera.ui.GLRootView - android:id="@+id/settings_ui" - android:layout_width="match_parent" - android:layout_height="match_parent"/> </FrameLayout> </com.android.camera.PreviewFrameLayout> </LinearLayout> diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index 3172f28..ccfd0bf 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -57,10 +57,6 @@ android:textSize="23dp" android:textStyle="bold" android:visibility="gone"/> - <com.android.camera.ui.GLRootView - android:id="@+id/settings_ui" - android:layout_width="match_parent" - android:layout_height="match_parent"/> </FrameLayout> </com.android.camera.PreviewFrameLayout> </LinearLayout> |