diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/album_set.xml | 8 | ||||
| -rw-r--r-- | res/layout/album_set_item.xml | 57 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/canvas_info.xml | 5 |
5 files changed, 39 insertions, 39 deletions
diff --git a/res/layout/album_set.xml b/res/layout/album_set.xml index 5ff1d23ff..5e2e84868 100644 --- a/res/layout/album_set.xml +++ b/res/layout/album_set.xml @@ -12,9 +12,11 @@ android:columnWidth="@dimen/album_set_item_width" android:stretchMode="columnWidth" android:drawSelectorOnTop="true" - android:padding="10dp" - android:horizontalSpacing="10dp" - android:verticalSpacing="10dp" /> + android:background="#E5E5E5" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:horizontalSpacing="6dp" + android:verticalSpacing="6dp" /> <TextView android:id="@id/android:empty" diff --git a/res/layout/album_set_item.xml b/res/layout/album_set_item.xml index bdecd5fd1..ad0e0db20 100644 --- a/res/layout/album_set_item.xml +++ b/res/layout/album_set_item.xml @@ -1,42 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="match_parent" - android:background="#FFF" > + android:orientation="vertical" + android:background="?android:attr/activatedBackgroundIndicator" + android:padding="2dp" > - <TextView - android:id="@+id/album_set_item_title" - android:layout_width="wrap_content" + <LinearLayout android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_marginLeft="10dp" - android:layout_marginTop="10dp" - android:ellipsize="end" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:layout_width="match_parent" + android:orientation="vertical" + android:padding="10dp" + android:background="#FFF" > - <TextView - android:id="@+id/album_set_item_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@+id/album_set_item_title" - android:layout_below="@+id/album_set_item_title" - android:layout_marginBottom="10dp" - android:textAppearance="?android:attr/textAppearanceSmall" /> + <TextView + android:id="@+id/album_set_item_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/album_set_item_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#AAA" /> + </LinearLayout> <ImageView android:id="@+id/album_set_item_image" android:layout_width="match_parent" android:layout_height="@dimen/album_set_item_image_height" - android:layout_below="@+id/album_set_item_date" android:scaleType="centerCrop" /> - - <ProgressBar - android:id="@+id/album_set_item_upload_progress" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="invisible" - android:layout_alignParentBottom="true" /> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 9ef192cb2..aba596f16 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -52,6 +52,6 @@ <dimen name="thumbnail_margin">3dip</dimen> <!-- configuration for album set page --> - <dimen name="album_set_item_image_height">100dp</dimen> + <dimen name="album_set_item_image_height">120dp</dimen> <dimen name="album_set_item_width">140dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 263b8b15b..6e35bfc14 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1010,4 +1010,10 @@ CHAR LIMIT = NONE] --> <string name="tab_photos">Photos</string> <!-- Title for the albums tab [CHAR LIMIT=25] --> <string name="tab_albums">Albums</string> + + <!-- String indicating how many photos are in an album [CHAR LIMIT=15] --> + <plurals name="number_of_photos"> + <item quantity="one">%1$d photo</item> + <item quantity="other">%1$d photos</item> + </plurals> </resources> diff --git a/res/xml/canvas_info.xml b/res/xml/canvas_info.xml deleted file mode 100644 index 5e50dfefd..000000000 --- a/res/xml/canvas_info.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Launcher data. --> -<launcher version="1"> - <root-uri>content://com.android.gallery3d.provider.CanvasProvider/launcher</root-uri> -</launcher> |