diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-01-18 01:12:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-18 01:12:40 +0000 |
| commit | 49c16ca6c335c053d923cdd8a101cef77178f307 (patch) | |
| tree | 4a141ee95ca632dd758dd9000b6f082eaf2faa0a | |
| parent | edb4158fe6c190a102ac51ebed11c3fcd1c3ef30 (diff) | |
| parent | 5d58a2f36675aa43ec20308f9da146506d1a8f70 (diff) | |
| download | android_packages_apps_Snap-49c16ca6c335c053d923cdd8a101cef77178f307.tar.gz android_packages_apps_Snap-49c16ca6c335c053d923cdd8a101cef77178f307.tar.bz2 android_packages_apps_Snap-49c16ca6c335c053d923cdd8a101cef77178f307.zip | |
Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce
| -rw-r--r-- | res/layout/ingest_activity_item_list.xml | 47 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
2 files changed, 43 insertions, 10 deletions
diff --git a/res/layout/ingest_activity_item_list.xml b/res/layout/ingest_activity_item_list.xml index 120cf15cb..23a95f658 100644 --- a/res/layout/ingest_activity_item_list.xml +++ b/res/layout/ingest_activity_item_list.xml @@ -13,13 +13,40 @@ See the License for the specific language governing permissions and limitations under the License. --> -<GridView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/ingest_gridview" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:columnWidth="200px" - android:numColumns="auto_fit" - android:fastScrollEnabled="true" - android:background="@android:color/background_dark" - android:choiceMode="multipleChoiceModal" - android:stretchMode="columnWidth" /> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <GridView + android:id="@+id/ingest_gridview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:columnWidth="200px" + android:numColumns="auto_fit" + android:fastScrollEnabled="true" + android:background="@android:color/background_dark" + android:choiceMode="multipleChoiceModal" + android:stretchMode="columnWidth" /> + + <LinearLayout + android:id="@+id/ingest_warning_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="20dip" + android:gravity="center" + android:orientation="horizontal" + android:visibility="gone" > + + <ImageView + android:id="@+id/ingest_warning_overlay_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:src="@android:drawable/ic_dialog_alert" /> + + <TextView + android:id="@+id/ingest_warning_overlay_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> +</merge> + diff --git a/res/values/strings.xml b/res/values/strings.xml index 94f56460f..9cbf72f96 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -542,4 +542,10 @@ <!-- Status message shown when content from an external camera is being imported --> <string name="ingest_importing">Importing...</string> + + <!-- Status message shown when there is no content available to be imported --> + <string name="ingest_empty_device">There is no content available for importing on this device.</string> + + <!-- Status message shown when there is no MTP device connected --> + <string name="ingest_no_device">There is no MTP device connected</string> </resources> |