diff options
| author | Likai Ding <likaid@codeaurora.org> | 2015-01-26 10:07:21 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2015-02-02 13:55:08 +0800 |
| commit | e2fb5dc7798cf677f6a66b6a697c4a011b0a101f (patch) | |
| tree | 9250c3a47e27b90e3c094c9d3ffa1365c3914178 /res/layout-port/camera_controls.xml | |
| parent | 07cf80cc97c68f12d5728919fcebba28e750761d (diff) | |
| download | android_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-port/camera_controls.xml')
| -rw-r--r-- | res/layout-port/camera_controls.xml | 58 |
1 files changed, 17 insertions, 41 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index ee24cfef2..121f25b6e 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -33,17 +33,11 @@ android:layout_marginRight="-8dip" layout="@layout/menu_indicators" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/menu" - style="@style/MenuButtonOuter" - 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> + style="@style/MenuButton" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> <com.android.camera.ui.ModuleSwitcher android:id="@+id/camera_switcher" @@ -73,41 +67,21 @@ android:contentDescription="@string/switch_photo_filmstrip" android:scaleType="fitCenter" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView 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> + style="@style/ToggleButton" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView android:id="@+id/hdr_switcher" - style="@style/ToggleButtonOuter" > + style="@style/ToggleButton" /> - <com.android.camera.ui.RotateImageView - style="@style/ToggleButton" - android:layout_gravity="center" /> - </com.android.camera.ui.RotatableLayout> - - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView 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> + style="@style/ToggleButton" /> - <com.android.camera.ui.RotatableLayout + <com.android.camera.ui.RotateImageView 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> + style="@style/ToggleButton" /> <LinearLayout android:id="@+id/remaining_photos" @@ -122,13 +96,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@android:color/transparent" - android:textColor="@android:color/white" /> + android:textColor="@android:color/white" + android:visibility="gone" /> <ImageView android:id="@+id/remaining_photos_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/remaining_sheets" /> + android:src="@drawable/remaining_sheets" + android:visibility="gone" /> </LinearLayout> -</com.android.camera.ui.CameraControls>
\ No newline at end of file +</com.android.camera.ui.CameraControls> |