diff options
| author | Doris Liu <tianliu@google.com> | 2013-12-06 18:11:51 -0800 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-12-06 18:16:34 -0800 |
| commit | b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6 (patch) | |
| tree | 3f867bb9272d05d026f6a087eee885b3f3e243f0 /res | |
| parent | b15eb56aefa6dc6a185aa62cba408d853ff4e6bb (diff) | |
| download | android_packages_apps_Camera2-b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6.tar.gz android_packages_apps_Camera2-b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6.tar.bz2 android_packages_apps_Camera2-b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6.zip | |
Refining shimmy
Bug: 11858581
Change-Id: I7eefc5189caefc6d23d2dbbca243632db716b0c3
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/activity_main.xml | 1 | ||||
| -rw-r--r-- | res/layout/camera.xml | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 1617750a8..dc27eb244 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -31,6 +31,5 @@ android:visibility="gone" android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/mode_list_layout" /> </com.android.camera.ui.MainActivityLayout> diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 6f1c11143..90060c743 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -13,9 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- TODO: Now camera root gets cleared during mode switch. We need to move mode + switcher into camera root when refactor is finished. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" android:layout_width="match_parent" android:layout_height="match_parent" > + <FrameLayout + android:id="@+id/camera_app_root" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <include layout="@layout/mode_list_layout" /> </FrameLayout> |