summaryrefslogtreecommitdiffstats
path: root/res/layout
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
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')
-rw-r--r--res/layout/filter_mode_view.xml56
-rw-r--r--res/layout/pano_module_capture.xml1
-rw-r--r--res/layout/pano_module_review.xml1
-rw-r--r--res/layout/scene_mode_view.xml4
4 files changed, 34 insertions, 28 deletions
diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml
index dfa036c1f..558d7ce77 100644
--- a/res/layout/filter_mode_view.xml
+++ b/res/layout/filter_mode_view.xml
@@ -26,32 +26,36 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="@dimen/filter_mode_width"
- android:layout_height="@dimen/filter_mode_height"
- android:layout_gravity="center"
- android:orientation="vertical"
- android:padding="@dimen/filter_mode_padding" >
+<com.android.camera.ui.RotateLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/filter_mode_padding">
- <ImageView
- android:id="@+id/image"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:layout_gravity="center"
- android:padding="2dp" />
+ <LinearLayout
+ android:layout_width="@dimen/filter_mode_width"
+ android:layout_height="@dimen/filter_mode_height"
+ android:orientation="vertical">
- <TextView
- android:id="@+id/label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:shadowColor="@android:color/black"
- android:shadowDx="1"
- android:shadowDy="1"
- android:shadowRadius="2"
- android:singleLine="true"
- android:textColor="@android:color/white"
- android:textSize="13sp"
- android:textStyle="bold" />
+ <ImageView
+ android:id="@+id/image"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:layout_gravity="center"
+ android:padding="2dp" />
-</LinearLayout>
+ <TextView
+ android:id="@+id/label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:shadowColor="@android:color/black"
+ android:shadowDx="1"
+ android:shadowDy="1"
+ android:shadowRadius="2"
+ android:singleLine="true"
+ android:textColor="@android:color/white"
+ android:textSize="13sp"
+ android:textStyle="bold" />
+ </LinearLayout>
+</com.android.camera.ui.RotateLayout>
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
index c6c131741..6ab8c9e4b 100644
--- a/res/layout/pano_module_capture.xml
+++ b/res/layout/pano_module_capture.xml
@@ -63,6 +63,7 @@
<!-- The bottom bar with progress bar and direction indicators -->
<FrameLayout
+ android:id="@+id/pano_progress_layout"
style="@style/PanoViewHorizontalBar"
android:paddingTop="20dp"
android:gravity="top"
diff --git a/res/layout/pano_module_review.xml b/res/layout/pano_module_review.xml
index 3f80e8af0..6aeaa753c 100644
--- a/res/layout/pano_module_review.xml
+++ b/res/layout/pano_module_review.xml
@@ -22,6 +22,7 @@
android:layout_width="match_parent">
<TextView
+ android:id="@+id/pano_review_indicator"
style="@style/PanoViewHorizontalBar"
android:layout_width="match_parent"
android:layout_height="0dp"
diff --git a/res/layout/scene_mode_view.xml b/res/layout/scene_mode_view.xml
index e8a9499d6..d4c2a259c 100644
--- a/res/layout/scene_mode_view.xml
+++ b/res/layout/scene_mode_view.xml
@@ -26,7 +26,7 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
@@ -64,4 +64,4 @@
android:textStyle="bold" />
</LinearLayout>
-</LinearLayout>
+</com.android.camera.ui.RotateLayout>