diff options
| author | Owen Lin <owenlin@google.com> | 2009-12-04 04:33:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 04:33:21 -0800 |
| commit | e84bec36fc79750e85cc845550610eac24f0c5f1 (patch) | |
| tree | c0560417397ad73d90b1d38cee1fe96b7407ec07 /res | |
| parent | 11aeb1a98f29ff3525fc8179ce519e4924b754c8 (diff) | |
| parent | 0588c8b15c304477c31978016d536abb291e5274 (diff) | |
| download | LegacyCamera-e84bec36fc79750e85cc845550610eac24f0c5f1.zip LegacyCamera-e84bec36fc79750e85cc845550610eac24f0c5f1.tar.gz LegacyCamera-e84bec36fc79750e85cc845550610eac24f0c5f1.tar.bz2 | |
am 0588c8b1: am ff58fb69: Use icon to indicate the orientation of the taken photos.
Merge commit '0588c8b15c304477c31978016d536abb291e5274'
* commit '0588c8b15c304477c31978016d536abb291e5274':
Use icon to indicate the orientation of the taken photos.
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/btn_ic_mode_switch_camera.png | bin | 1139 -> 1014 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/btn_ic_mode_switch_video.png | bin | 836 -> 752 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/drawable-mdpi/btn_ic_mode_switch_camera.png | bin | 762 -> 694 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | res/drawable-mdpi/btn_ic_mode_switch_video.png | bin | 542 -> 544 bytes | |||
| -rw-r--r-- | res/layout/camera_control.xml | 11 |
5 files changed, 8 insertions, 3 deletions
diff --git a/res/drawable-hdpi/btn_ic_mode_switch_camera.png b/res/drawable-hdpi/btn_ic_mode_switch_camera.png Binary files differindex 3f3e534..ca53bb7 100644 --- a/res/drawable-hdpi/btn_ic_mode_switch_camera.png +++ b/res/drawable-hdpi/btn_ic_mode_switch_camera.png diff --git a/res/drawable-hdpi/btn_ic_mode_switch_video.png b/res/drawable-hdpi/btn_ic_mode_switch_video.png Binary files differindex 0fc8302..09a2036 100644 --- a/res/drawable-hdpi/btn_ic_mode_switch_video.png +++ b/res/drawable-hdpi/btn_ic_mode_switch_video.png diff --git a/res/drawable-mdpi/btn_ic_mode_switch_camera.png b/res/drawable-mdpi/btn_ic_mode_switch_camera.png Binary files differindex 9dbe57b..b8b0df7 100755..100644 --- a/res/drawable-mdpi/btn_ic_mode_switch_camera.png +++ b/res/drawable-mdpi/btn_ic_mode_switch_camera.png diff --git a/res/drawable-mdpi/btn_ic_mode_switch_video.png b/res/drawable-mdpi/btn_ic_mode_switch_video.png Binary files differindex 397e9ad..f31e9ff 100755..100644 --- a/res/drawable-mdpi/btn_ic_mode_switch_video.png +++ b/res/drawable-mdpi/btn_ic_mode_switch_video.png diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index 8f7f6c8..6b84ad2 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -23,7 +23,8 @@ android:layout_marginBottom="10dp" android:layout_alignParentRight="true"> - <ImageView android:id="@+id/review_thumbnail" + <com.android.camera.RotateImageView + android:id="@+id/review_thumbnail" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:layout_height="52dp" @@ -34,10 +35,12 @@ <LinearLayout android:id="@+id/camera_switch_set" android:orientation="vertical" + android:gravity="center" android:layout_centerInParent="true" android:layout_height="wrap_content" android:layout_width="wrap_content"> - <ImageView android:layout_height="wrap_content" + <com.android.camera.RotateImageView android:id="@+id/video_switch_icon" + android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/btn_ic_mode_switch_video"/> <com.android.camera.Switcher android:id="@+id/camera_switch" @@ -45,7 +48,9 @@ android:layout_height="70dp" android:src="@drawable/btn_mode_switch_knob" android:background="@drawable/btn_mode_switch_bg" /> - <ImageView android:layout_height="wrap_content" + <com.android.camera.RotateImageView + android:id="@+id/camera_switch_icon" + android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginBottom="3dp" android:src="@drawable/btn_ic_mode_switch_camera"/> |
