diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/ingest_activity_item_list.xml | 1 | ||||
| -rw-r--r-- | res/layout/ingest_date_tile.xml | 7 | ||||
| -rw-r--r-- | res/layout/ingest_fullsize.xml | 3 | ||||
| -rw-r--r-- | res/layout/ingest_thumbnail.xml | 4 | ||||
| -rw-r--r-- | res/menu/ingest_menu_item_list_selection.xml | 4 | ||||
| -rw-r--r-- | res/values/ids.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 19 |
7 files changed, 32 insertions, 9 deletions
diff --git a/res/layout/ingest_activity_item_list.xml b/res/layout/ingest_activity_item_list.xml index f0e91e8e2..b91f0ce74 100644 --- a/res/layout/ingest_activity_item_list.xml +++ b/res/layout/ingest_activity_item_list.xml @@ -52,6 +52,7 @@ android:id="@+id/ingest_warning_view_text" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="10dip" android:layout_marginLeft="10dip" android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml index 6b5e93445..8cd63e9a0 100644 --- a/res/layout/ingest_date_tile.xml +++ b/res/layout/ingest_date_tile.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_column="0" android:layout_row="0" - android:layout_gravity="bottom|right" + android:layout_gravity="bottom|end" android:layout_marginTop="7sp" android:includeFontPadding="false" android:textSize="16sp" @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_column="0" android:layout_row="1" - android:layout_gravity="top|right" + android:layout_gravity="top|end" android:includeFontPadding="false" android:textSize="13sp" android:fontFamily="sans-serif-light" @@ -52,7 +52,8 @@ android:layout_column="1" android:layout_row="0" android:layout_rowSpan="2" - android:layout_gravity="top|left" + android:layout_gravity="top|start" + android:layout_marginStart="5sp" android:layout_marginLeft="5sp" android:includeFontPadding="false" android:textSize="44sp" diff --git a/res/layout/ingest_fullsize.xml b/res/layout/ingest_fullsize.xml index fad596c72..d57c4ae50 100644 --- a/res/layout/ingest_fullsize.xml +++ b/res/layout/ingest_fullsize.xml @@ -37,7 +37,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:text="@string/Import" /> + android:text="@string/ingest_import" /> </com.android.gallery3d.ingest.ui.MtpFullscreenView>
\ No newline at end of file diff --git a/res/layout/ingest_thumbnail.xml b/res/layout/ingest_thumbnail.xml index 690714934..b36ec93a8 100644 --- a/res/layout/ingest_thumbnail.xml +++ b/res/layout/ingest_thumbnail.xml @@ -17,6 +17,4 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="centerCrop" - android:background="@drawable/ingest_item_list_selector"> -</com.android.gallery3d.ingest.ui.MtpThumbnailTileView>
\ No newline at end of file + android:scaleType="centerCrop" /> diff --git a/res/menu/ingest_menu_item_list_selection.xml b/res/menu/ingest_menu_item_list_selection.xml index 2f020b671..b3fa11100 100644 --- a/res/menu/ingest_menu_item_list_selection.xml +++ b/res/menu/ingest_menu_item_list_selection.xml @@ -16,7 +16,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/ingest_switch_view" android:showAsAction="always" /> - <item android:id="@+id/import_items" + <item android:id="@+id/ingest_import_items" android:showAsAction="always|withText" - android:title="@string/Import" /> + android:title="@string/ingest_import" /> </menu>
\ No newline at end of file diff --git a/res/values/ids.xml b/res/values/ids.xml index fefd5f0e3..f5b4a48fd 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -20,4 +20,7 @@ <item type="id" name="action_toggle_full_caching" /> <item type="id" name="action_select_all" /> <item type="id" name="viewpager" /> + + <item type="id" name="ingest_notification_scanning" /> + <item type="id" name="ingest_notification_importing" /> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1ef8c1373..570014e3e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -528,6 +528,12 @@ <!-- The label on the button that will save an edited image --> <string name="save" msgid="8140440041190264400">Save</string> + <!-- A label representing the action of importing media item(s) [CHAR LIMIT=20] --> + <string name="ingest_import">@string/Import</string> + + <!-- A label that indicates the media import operation completed [CHAR LIMIT=20] --> + <string name="ingest_import_complete">@string/import_complete</string> + <!-- Text of notification message which is shown when user attaches camera --> <string name="ingest_scanning" msgid="2048262851775139720">Scanning content...</string> @@ -538,6 +544,13 @@ <item quantity="other">%1$d items scanned</item> </plurals> + <!-- String indicating how many media items from the camera have been selected --> + <plurals name="ingest_number_of_items_selected"> + <item quantity="zero">%1$d items selected</item> + <item quantity="one">%1$d item selected</item> + <item quantity="other">%1$d items selected</item> + </plurals> + <!-- Status message shown when content from the camera is being sorted --> <string name="ingest_sorting" msgid="624687230903648118">Sorting...</string> @@ -553,6 +566,12 @@ <!-- Status message shown when there is no MTP device connected --> <string name="ingest_no_device">There is no MTP device connected</string> + <!-- Label for album grid button --> + <string name="ingest_switch_photo_grid">@string/switch_photo_grid</string> + + <!-- Label for fullscreen button. [CHAR LIMIT=20] --> + <string name="ingest_switch_photo_fullscreen">@string/switch_photo_fullscreen</string> + <!-- Camera resources below --> <!-- General strings --> |