summaryrefslogtreecommitdiffstats
path: root/res/layout-land/camera_controls.xml
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2015-01-26 10:07:21 +0800
committerLikai Ding <likaid@codeaurora.org>2015-02-02 13:55:08 +0800
commite2fb5dc7798cf677f6a66b6a697c4a011b0a101f (patch)
tree9250c3a47e27b90e3c094c9d3ffa1365c3914178 /res/layout-land/camera_controls.xml
parent07cf80cc97c68f12d5728919fcebba28e750761d (diff)
downloadandroid_packages_apps_Snap-e2fb5dc7798cf677f6a66b6a697c4a011b0a101f.tar.gz
android_packages_apps_Snap-e2fb5dc7798cf677f6a66b6a697c4a011b0a101f.tar.bz2
android_packages_apps_Snap-e2fb5dc7798cf677f6a66b6a697c4a011b0a101f.zip
SnapdragonCamera: fix portrait orientation
Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
Diffstat (limited to 'res/layout-land/camera_controls.xml')
-rw-r--r--res/layout-land/camera_controls.xml134
1 files changed, 0 insertions, 134 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
deleted file mode 100644
index f10ae9271..000000000
--- a/res/layout-land/camera_controls.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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="@dimen/switcher_size"
- android:layout_height="match_parent"
- android:layout_gravity="right"
- android:clickable="true" />
-
- <include
- android:layout_width="64dip"
- android:layout_height="64dip"
- android:layout_gravity="top|right"
- android:layout_marginRight="8dip"
- android:layout_marginTop="-8dip"
- layout="@layout/menu_indicators" />
-
- <com.android.camera.ui.RotatableLayout
- android:id="@+id/menu"
- style="@style/ToggleButtonOuter"
- android:layout_marginRight="2dip" >
-
- <ImageView
- style="@style/MenuButton"
- android:layout_gravity="center"
- android:contentDescription="@string/accessibility_menu_button"
- android:src="@drawable/ic_settings" />
- </com.android.camera.ui.RotatableLayout>
-
- <com.android.camera.ui.ModuleSwitcher
- android:id="@+id/camera_switcher"
- style="@style/SwitcherButton"
- android:layout_gravity="right|bottom"
- android:layout_marginRight="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="right|center_vertical"
- android:layout_marginRight="@dimen/shutter_offset"
- 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_gravity="top|right"
- android:background="@android:color/black"
- android:contentDescription="@string/switch_photo_filmstrip"
- android:scaleType="fitCenter" />
-
- <com.android.camera.ui.RotatableLayout
- android:id="@+id/front_back_switcher"
- style="@style/ToggleButtonOuter" >
-
- <com.android.camera.ui.RotateImageView
- style="@style/ToggleButton"
- android:layout_gravity="center" />
- </com.android.camera.ui.RotatableLayout>
-
- <com.android.camera.ui.RotatableLayout
- android:id="@+id/hdr_switcher"
- style="@style/ToggleButtonOuter" >
-
- <com.android.camera.ui.RotateImageView
- style="@style/ToggleButton"
- android:layout_gravity="center" />
- </com.android.camera.ui.RotatableLayout>
-
- <com.android.camera.ui.RotatableLayout
- android:id="@+id/scene_mode_switcher"
- style="@style/ToggleButtonOuter" >
-
- <com.android.camera.ui.RotateImageView
- style="@style/ToggleButton"
- android:layout_gravity="center" />
- </com.android.camera.ui.RotatableLayout>
-
- <com.android.camera.ui.RotatableLayout
- android:id="@+id/filter_mode_switcher"
- style="@style/ToggleButtonOuter" >
-
- <com.android.camera.ui.RotateImageView
- style="@style/ToggleButton"
- android:layout_gravity="center" />
- </com.android.camera.ui.RotatableLayout>
-
- <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:background="@android:color/transparent"
- 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.CameraControls> \ No newline at end of file