summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2012-12-04 17:35:11 -0500
committerChris Wren <cwren@android.com>2012-12-10 10:48:47 -0500
commit2ccf92a79a2749a6fdaf5c1242f5d72de48ef111 (patch)
treef1cb3df449c936501913735d09da38ec8dd642b9 /res
parent387363c426e097c358bd41367e0a8f4339fc8dc3 (diff)
downloadandroid_packages_screensavers_PhotoTable-2ccf92a79a2749a6fdaf5c1242f5d72de48ef111.tar.gz
android_packages_screensavers_PhotoTable-2ccf92a79a2749a6fdaf5c1242f5d72de48ef111.tar.bz2
android_packages_screensavers_PhotoTable-2ccf92a79a2749a6fdaf5c1242f5d72de48ef111.zip
Add 'select all' to photo dream settings.
Bug: 7269182 Change-Id: I78898bb9e76d6233487b4888e56f896f3c6ea72d
Diffstat (limited to 'res')
-rw-r--r--res/layout/settingslist.xml2
-rw-r--r--res/menu/photodream_settings_menu.xml21
-rw-r--r--res/values/strings.xml7
3 files changed, 29 insertions, 1 deletions
diff --git a/res/layout/settingslist.xml b/res/layout/settingslist.xml
index 1f2128b..0ea6661 100644
--- a/res/layout/settingslist.xml
+++ b/res/layout/settingslist.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
diff --git a/res/menu/photodream_settings_menu.xml b/res/menu/photodream_settings_menu.xml
new file mode 100644
index 0000000..3ae368f
--- /dev/null
+++ b/res/menu/photodream_settings_menu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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/photodream_menu_all"
+ android:title="@string/photodream_select_all"
+ android:showAsAction="ifRoom"
+ />
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 858d6c1..087f8b1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,4 +40,11 @@
<!-- Instruct the user to configure the screensaver in settings to see photos. -->
<string name="need_to_configure">No photos selected.</string>
+
+ <!-- Click to select all albums in the album selection activity. [CHAR LIMIT=15] -->
+ <string name="photodream_select_all">Select All</string>
+
+ <!-- Click to clear selection in the album selection activity. [CHAR LIMIT=15] -->
+ <string name="photodream_select_none">Deselect All</string>
+
</resources>