diff options
author | Likai Ding <likaid@codeaurora.org> | 2015-04-02 20:39:07 +0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-07-30 05:05:25 -0700 |
commit | 0bce7c994dce9044667adfbddebb59ab6c88f70c (patch) | |
tree | dd5a94fa93bd272253e891ddb0b46aeab909e39f /res/layout/camera_controls.xml | |
parent | f09d9d08dad6d71e2c88b5e057bd061b984cbd29 (diff) | |
download | android_packages_apps_Snap-0bce7c994dce9044667adfbddebb59ab6c88f70c.tar.gz android_packages_apps_Snap-0bce7c994dce9044667adfbddebb59ab6c88f70c.tar.bz2 android_packages_apps_Snap-0bce7c994dce9044667adfbddebb59ab6c88f70c.zip |
SnapdragonCamera: fix crash with persist.panel.orientation
The two layout files were only available in portrait mode. Make
them as default.
Change-Id: Iabc4caf1a5b5b015a097a914b489f412153eeec4
Diffstat (limited to 'res/layout/camera_controls.xml')
-rw-r--r-- | res/layout/camera_controls.xml | 116 |
1 files changed, 116 insertions, 0 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml new file mode 100644 index 000000000..77ff076b9 --- /dev/null +++ b/res/layout/camera_controls.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_controls" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <View + android:id="@+id/blocker" + android:layout_width="match_parent" + android:layout_height="@dimen/switcher_size" + android:layout_gravity="bottom" + android:clickable="true" /> + + <com.android.camera.ui.ModuleSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="bottom|left" + android:layout_marginBottom="2dip" + android:contentDescription="@string/accessibility_mode_picker" /> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="@dimen/shutter_size" + android:layout_height="@dimen/shutter_size" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="@dimen/shutter_offset" + android:layout_marginTop="@dimen/shutter_offset_top" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/btn_new_shutter" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/preview_thumb" + android:layout_width="@dimen/capture_size" + android:layout_height="@dimen/capture_size" + android:layout_margin="12dp" + android:layout_gravity="top|right" + android:background="@android:color/transparent" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="fitCenter" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/menu" + style="@style/ToggleButton" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/front_back_switcher" + style="@style/ToggleButton" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/filter_mode_switcher" + style="@style/ToggleButton" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/scene_mode_switcher" + style="@style/ToggleButton" /> + + <com.android.camera.ui.RotateImageView + android:id="@+id/hdr_switcher" + style="@style/ToggleButton" /> + + <LinearLayout + android:id="@+id/remaining_photos" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:orientation="horizontal" + android:visibility="gone" > + + <TextView + android:id="@+id/remaining_photos_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@android:color/white" /> + + <ImageView + android:id="@+id/remaining_photos_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/remaining_sheets" /> + </LinearLayout> + + <com.android.camera.ui.HistogramView + android:id="@+id/histogram" + android:layout_width="200dip" + android:layout_height="200dip" + android:layout_marginTop="20dip" + android:padding="2dp" + android:visibility="gone" /> + + <TextView + android:id="@+id/auto_hdr_notice" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/auto_hdr_enabled" + android:visibility="gone" /> + +</com.android.camera.ui.CameraControls> |