diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 5 | ||||
| -rw-r--r-- | res/layout/gallerypicker.xml | 54 | ||||
| -rw-r--r-- | res/layout/image_gallery_2.xml | 2 | ||||
| -rw-r--r-- | res/layout/video_camera.xml | 8 |
4 files changed, 54 insertions, 15 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 8892134..60066ec 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -49,7 +49,9 @@ android:id="@+id/mode_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_camera_indicator_photo" + android:src="@drawable/ic_camera_indicator_photo_combo" + android:clickable="true" + android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_marginRight="5dip" @@ -62,7 +64,6 @@ android:layout_height="75dip" android:clickable="true" android:focusable="true" - android:focusableInTouchMode="true" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true" android:layout_marginLeft="10dip" diff --git a/res/layout/gallerypicker.xml b/res/layout/gallerypicker.xml index 2227989..4bc7789 100644 --- a/res/layout/gallerypicker.xml +++ b/res/layout/gallerypicker.xml @@ -14,14 +14,48 @@ limitations under the License. --> -<GridView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/albums" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/root" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingTop="2dip" - android:numColumns="auto_fit" - android:columnWidth="148dp" - android:stretchMode="spacingWidthUniform" - android:drawSelectorOnTop="false" - android:cacheColorHint="#000000" - android:background="#000000"/> + android:layout_height="fill_parent"> + <GridView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/albums" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:paddingTop="2dip" + android:numColumns="auto_fit" + android:columnWidth="148dp" + android:stretchMode="spacingWidthUniform" + android:drawSelectorOnTop="false" + android:cacheColorHint="#000000" + android:background="#000000"/> + + <RelativeLayout android:id="@+id/no_images" + android:visibility="gone" + android:orientation="vertical" + android:layout_centerInParent="true" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <ImageView + android:id="@+id/no_pictures_image" + android:layout_centerInParent="true" + android:layout_gravity="center" + android:background="@drawable/ic_gallery_empty2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + /> + + <TextView + android:layout_below="@id/no_pictures_image" + android:layout_centerHorizontal="true" + android:paddingTop="5dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/image_gallery_NoImageView_text" + android:textColor="#FFBEBEBE" + android:textSize="18dip" + /> + </RelativeLayout> + +</RelativeLayout> diff --git a/res/layout/image_gallery_2.xml b/res/layout/image_gallery_2.xml index 0f4926c..d7158a9 100644 --- a/res/layout/image_gallery_2.xml +++ b/res/layout/image_gallery_2.xml @@ -36,7 +36,7 @@ android:id="@+id/no_pictures_image" android:layout_centerInParent="true" android:layout_gravity="center" - android:background="@drawable/ic_gallery_empty" + android:background="@drawable/ic_gallery_empty2" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index 652b354..1c73b10 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -44,7 +44,9 @@ android:id="@+id/mode_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_camera_indicator_video" + android:src="@drawable/ic_camera_indicator_video_combo" + android:clickable="true" + android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_marginRight="5dip" @@ -55,7 +57,9 @@ android:id="@+id/recording_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_camera_bar_indicator_record" + android:src="@drawable/ic_camera_bar_indicator_record_combo" + android:clickable="true" + android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:layout_marginRight="15dip" |