summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable/ingest_item_list_selector.xml23
-rw-r--r--res/layout/ingest_activity_item_list.xml25
-rw-r--r--res/layout/ingest_date_tile.xml63
-rw-r--r--res/layout/ingest_thumbnail.xml22
-rw-r--r--res/menu/ingest_menu_item_list_selection.xml20
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/strings.xml19
7 files changed, 175 insertions, 0 deletions
diff --git a/res/drawable/ingest_item_list_selector.xml b/res/drawable/ingest_item_list_selector.xml
new file mode 100644
index 000000000..1a4541f94
--- /dev/null
+++ b/res/drawable/ingest_item_list_selector.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@color/ingest_highlight_semitransparent"
+ android:state_checked="true" />
+ <item android:drawable="@color/ingest_highlight_semitransparent"
+ android:state_selected="true" />
+ <item android:drawable="@color/ingest_highlight_semitransparent"
+ android:state_pressed="true" />
+</selector> \ No newline at end of file
diff --git a/res/layout/ingest_activity_item_list.xml b/res/layout/ingest_activity_item_list.xml
new file mode 100644
index 000000000..120cf15cb
--- /dev/null
+++ b/res/layout/ingest_activity_item_list.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ 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" />
diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml
new file mode 100644
index 000000000..6b5e93445
--- /dev/null
+++ b/res/layout/ingest_date_tile.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.gallery3d.ingest.ui.DateTileView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/black" >
+ <GridLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center" >
+ <TextView
+ android:id="@+id/date_tile_month"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_column="0"
+ android:layout_row="0"
+ android:layout_gravity="bottom|right"
+ android:layout_marginTop="7sp"
+ android:includeFontPadding="false"
+ android:textSize="16sp"
+ android:textAllCaps="true"
+ android:fontFamily="sans-serif"
+ android:textColor="@color/ingest_date_tile_text" />
+ <TextView
+ android:id="@+id/date_tile_year"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_column="0"
+ android:layout_row="1"
+ android:layout_gravity="top|right"
+ android:includeFontPadding="false"
+ android:textSize="13sp"
+ android:fontFamily="sans-serif-light"
+ android:textColor="@color/ingest_date_tile_text" />
+ <TextView
+ android:id="@+id/date_tile_day"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_column="1"
+ android:layout_row="0"
+ android:layout_rowSpan="2"
+ android:layout_gravity="top|left"
+ android:layout_marginLeft="5sp"
+ android:includeFontPadding="false"
+ android:textSize="44sp"
+ android:textStyle="bold"
+ android:fontFamily="sans-serif"
+ android:textColor="@color/ingest_date_tile_text" />
+ </GridLayout>
+</com.android.gallery3d.ingest.ui.DateTileView> \ No newline at end of file
diff --git a/res/layout/ingest_thumbnail.xml b/res/layout/ingest_thumbnail.xml
new file mode 100644
index 000000000..690714934
--- /dev/null
+++ b/res/layout/ingest_thumbnail.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.gallery3d.ingest.ui.MtpThumbnailTileView
+ 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
diff --git a/res/menu/ingest_menu_item_list_selection.xml b/res/menu/ingest_menu_item_list_selection.xml
new file mode 100644
index 000000000..aaf3262ed
--- /dev/null
+++ b/res/menu/ingest_menu_item_list_selection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/import_items"
+ android:showAsAction="always|withText"
+ android:title="@string/Import" />
+</menu> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9fd7802f4..2dedd515e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -40,4 +40,7 @@
<color name="slideshow_background">#1A1A1A</color>
<color name="button_dark_transparent_background">#6000</color>
+
+ <color name="ingest_highlight_semitransparent">#8833b5e5</color>
+ <color name="ingest_date_tile_text">#33b5e5</color>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3eb909513..94f56460f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -523,4 +523,23 @@
<!-- The label on the button that will save an edited image -->
<string name="save" msgid="8140440041190264400">Save</string>
+
+ <!-- Text of notification message which is shown when user attaches camera -->
+ <string name="ingest_scanning" msgid="2048262851775139720">Scanning content...</string>
+
+ <!-- String indicating how many media items from the camera have been scanned -->
+ <plurals name="ingest_number_of_items_scanned">
+ <item quantity="zero">%1$d items scanned</item>
+ <item quantity="one">%1$d item scanned</item>
+ <item quantity="other">%1$d items scanned</item>
+ </plurals>
+
+ <!-- Status message shown when content from the camera is being sorted -->
+ <string name="ingest_sorting" msgid="624687230903648118">Sorting...</string>
+
+ <!-- Status message shown when scanning the content from the camera has completed -->
+ <string name="ingest_scanning_done">Scanning done</string>
+
+ <!-- Status message shown when content from an external camera is being imported -->
+ <string name="ingest_importing">Importing...</string>
</resources>