diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-w1024dp/camera_control.xml | 4 | ||||
| -rw-r--r-- | res/layout-w1024dp/mode_picker.xml | 4 | ||||
| -rw-r--r-- | res/layout/camera_control.xml | 14 | ||||
| -rw-r--r-- | res/layout/mode_picker.xml | 4 | ||||
| -rw-r--r-- | res/layout/review_thumbnail.xml | 7 |
5 files changed, 24 insertions, 9 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml index b86d593..ca70b44 100644 --- a/res/layout-w1024dp/camera_control.xml +++ b/res/layout-w1024dp/camera_control.xml @@ -54,6 +54,10 @@ android:src="@drawable/btn_zoom_out" android:visibility="gone" /> + <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker" + android:clickable="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> </com.android.camera.ui.IndicatorWheel> <include layout="@layout/mode_picker"/> diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-w1024dp/mode_picker.xml index 90cc008..1ee6226 100644 --- a/res/layout-w1024dp/mode_picker.xml +++ b/res/layout-w1024dp/mode_picker.xml @@ -26,6 +26,7 @@ android:layout_alignParentRight="true" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:background="@drawable/btn_mode_background" android:src="@drawable/btn_ic_camera" /> <LinearLayout android:id="@+id/mode_selection" @@ -40,14 +41,17 @@ <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_panorama" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_video" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_video" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_camera" /> </LinearLayout> </com.android.camera.ModePicker> diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index ef16dd7..2185c32 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -19,12 +19,20 @@ android:layout_alignParentRight="true" android:layout_height="match_parent" android:layout_width="76dp" - android:orientation="vertical" - android:paddingTop="24dp" - android:paddingBottom="3dp"> + android:orientation="vertical"> <include layout="@layout/review_thumbnail"/> + <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker" + android:clickable="true" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + android:layout_below="@+id/share_button" + android:layout_above="@+id/shutter_button" + android:layout_width="36dp" + android:layout_height="36dp" /> + <!-- need fixed size of the view since the source icon(HDPI) will be too large for phones --> + <com.android.camera.ShutterButton android:id="@+id/shutter_button" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml index f9f8530..abbdf76 100644 --- a/res/layout/mode_picker.xml +++ b/res/layout/mode_picker.xml @@ -24,6 +24,7 @@ android:layout_alignParentBottom="true" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:background="@drawable/btn_mode_background" android:src="@drawable/btn_ic_camera" /> <LinearLayout android:id="@+id/mode_selection" @@ -37,14 +38,17 @@ <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_panorama" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_video" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_video" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_camera" /> </LinearLayout> </com.android.camera.ModePicker> diff --git a/res/layout/review_thumbnail.xml b/res/layout/review_thumbnail.xml index f94a186..ef5e821 100644 --- a/res/layout/review_thumbnail.xml +++ b/res/layout/review_thumbnail.xml @@ -27,9 +27,4 @@ <com.android.camera.ui.RotateImageView android:id="@+id/thumbnail" android:layout_width="52dp" android:layout_height="52dp"/> - <com.android.camera.ui.RotateImageView android:id="@+id/share_icon" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/ic_viewfinder_share" - android:background="@android:color/black" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |