diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/camera_controls.xml | 15 | ||||
| -rw-r--r-- | res/layout-port/camera_controls.xml | 15 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 2 |
3 files changed, 7 insertions, 25 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index 1d911badc..65a17caae 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -64,14 +64,14 @@ android:scaleType="center" android:src="@drawable/btn_new_shutter" /> - <ImageView + <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="centerInside" - android:visibility="invisible" /> + android:scaleType="fitCenter" /> <com.android.camera.ui.RotatableLayout android:id="@+id/front_back_switcher" @@ -83,15 +83,6 @@ </com.android.camera.ui.RotatableLayout> <com.android.camera.ui.RotatableLayout - android:id="@+id/flash_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" > diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 130efc748..bf3cda0ab 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -64,14 +64,14 @@ android:scaleType="center" android:src="@drawable/btn_new_shutter" /> - <ImageView + <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="centerInside" - android:visibility="invisible" /> + android:scaleType="fitCenter" /> <com.android.camera.ui.RotatableLayout android:id="@+id/front_back_switcher" @@ -83,15 +83,6 @@ </com.android.camera.ui.RotatableLayout> <com.android.camera.ui.RotatableLayout - android:id="@+id/flash_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" > diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index c72f9bb1e..c76f5c658 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -283,7 +283,7 @@ <string name="pref_camera_video_tnr_default" translatable="false">off</string> <!-- Default face detection setting. --> - <string name="pref_camera_facedetection_default" translatable="false">on</string> + <string name="pref_camera_facedetection_default" translatable="false">off</string> <!-- Settings screen, Select Face Detection --> <string name="pref_camera_facedetection_title">Face Detection</string> |