Merge "Import translations. DO NOT MERGE"

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e62624c..b88187f 100644 (file)
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"አልበም ምረጥ"</string>
     <string name="select_group" msgid="6744208543323307114">"ቡድን ምረጥ"</string>
     <string name="set_image" msgid="2331476809308010401">"ምስል እንደ አዘጋጅ"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"ልጣፍ አዘጋጅ"</string>
     <string name="wallpaper" msgid="140165383777262070">"ልጣፍ በማቀናበር ላይ...."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"ልጣፍ"</string>
     <string name="delete" msgid="2839695998251824487">"ሰርዝ"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a566c24..ea13a58 100644 (file)
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -44,14 +44,13 @@
     <string name="select_album" msgid="1557063764849434077">"Selecciona un àlbum"</string>
     <string name="select_group" msgid="6744208543323307114">"Selecciona un grup"</string>
     <string name="set_image" msgid="2331476809308010401">"Defineix la imatge com a"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"Defineix el fons de pantalla"</string>
     <string name="wallpaper" msgid="140165383777262070">"S\'està establint el fons de pantalla..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Fons de pantalla"</string>
     <string name="delete" msgid="2839695998251824487">"Suprimeix"</string>
   <plurals name="delete_selection">
     <item quantity="one" msgid="6453379735401083732">"Vols supr. l\'element selecc.?"</item>
-    <item quantity="other" msgid="5874316486520635333">"Vols supr. l\'element selecc.?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Vols supr. els elements sel.?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"Confirma"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancel·la"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6675637..feab24d 100644 (file)
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -50,7 +50,7 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Tapet"</string>
     <string name="delete" msgid="2839695998251824487">"Slet"</string>
   <plurals name="delete_selection">
-    <item quantity="one" msgid="6453379735401083732">"Vil du slette valgte element?"</item>
+    <item quantity="one" msgid="6453379735401083732">"Vil du slette det valgte element?"</item>
     <item quantity="other" msgid="5874316486520635333">"Vil du slette valgte elementer?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"Bekræft"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f63e0a8..7435abe 100644 (file)
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"Επιλογή λευκώματος"</string>
     <string name="select_group" msgid="6744208543323307114">"Επιλογή ομάδας"</string>
     <string name="set_image" msgid="2331476809308010401">"Ορισμός εικόνας ως"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"Ορισμός ταπετσαρίας"</string>
     <string name="wallpaper" msgid="140165383777262070">"Ορισμός ταπετσαρίας..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Ταπετσαρία"</string>
     <string name="delete" msgid="2839695998251824487">"Διαγραφή"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 02e3d20..02b4967 100644 (file)
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"Select album"</string>
     <string name="select_group" msgid="6744208543323307114">"Select group"</string>
     <string name="set_image" msgid="2331476809308010401">"Set picture as"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"Set wallpaper"</string>
     <string name="wallpaper" msgid="140165383777262070">"Setting wallpaper..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Wallpaper"</string>
     <string name="delete" msgid="2839695998251824487">"Delete"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 35fb8e1..8f792c8 100644 (file)
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -50,8 +50,8 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Papel tapiz"</string>
     <string name="delete" msgid="2839695998251824487">"Eliminar"</string>
   <plurals name="delete_selection">
-    <item quantity="one" msgid="6453379735401083732">"¿Eliminar elemento selec.?"</item>
-    <item quantity="other" msgid="5874316486520635333">"¿Eliminar elementos selecs.?"</item>
+    <item quantity="one" msgid="6453379735401083732">"¿Eliminar elemento?"</item>
+    <item quantity="other" msgid="5874316486520635333">"¿Eliminar elementos?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"Confirmar"</string>
     <string name="cancel" msgid="3637516880917356226">"Cancelar"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cc8e57f..eb473ab 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"Seleccionar álbum"</string>
     <string name="select_group" msgid="6744208543323307114">"Seleccionar grupo"</string>
     <string name="set_image" msgid="2331476809308010401">"Establecer imagen como"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"Establecer fondo de pantalla"</string>
     <string name="wallpaper" msgid="140165383777262070">"Estableciendo fondo de pantalla..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Fondo de pantalla"</string>
     <string name="delete" msgid="2839695998251824487">"Borrar"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 85af46d..e674a9b 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -51,7 +51,7 @@
     <string name="delete" msgid="2839695998251824487">"Supprimer"</string>
   <plurals name="delete_selection">
     <item quantity="one" msgid="6453379735401083732">"Supprimer élément sélectionné ?"</item>
-    <item quantity="other" msgid="5874316486520635333">"Supprimer éléments sélectionnés ?"</item>
+    <item quantity="other" msgid="5874316486520635333">"Suppr. éléments sélectionnés ?"</item>
   </plurals>
     <string name="confirm" msgid="8646870096527848520">"Confirmer"</string>
     <string name="cancel" msgid="3637516880917356226">"Annuler"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8a68468..c62aad4 100644 (file)
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"בחר אלבום"</string>
     <string name="select_group" msgid="6744208543323307114">"בחר קבוצה"</string>
     <string name="set_image" msgid="2331476809308010401">"הגדר תמונה בתור"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"הגדר טפט"</string>
     <string name="wallpaper" msgid="140165383777262070">"מגדיר טפט..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"טפט"</string>
     <string name="delete" msgid="2839695998251824487">"מחק"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9acfa08..772ce63 100644 (file)
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"Chagua albamu"</string>
     <string name="select_group" msgid="6744208543323307114">"Chagua kikundi"</string>
     <string name="set_image" msgid="2331476809308010401">"Weka picha kama"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"Weka mandhari"</string>
     <string name="wallpaper" msgid="140165383777262070">"Inaweka karatasi ya ukuta..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Mandhari"</string>
     <string name="delete" msgid="2839695998251824487">"Futa"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b163d19..2095b9b 100644 (file)
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_album" msgid="1557063764849434077">"เลือกอัลบั้ม"</string>
     <string name="select_group" msgid="6744208543323307114">"เลือกกลุ่ม"</string>
     <string name="set_image" msgid="2331476809308010401">"ตั้งค่าภาพเป็น"</string>
-    <!-- no translation found for set_wallpaper (8491121226190175017) -->
-    <skip />
+    <string name="set_wallpaper" msgid="8491121226190175017">"ตั้งค่าวอลเปเปอร์"</string>
     <string name="wallpaper" msgid="140165383777262070">"กำลังตั้งค่าวอลเปเปอร์..."</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"วอลเปเปอร์"</string>
     <string name="delete" msgid="2839695998251824487">"ลบ"</string>

diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 66b4a22..867cda3 100644 (file)
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -36,7 +36,8 @@ import com.android.gallery3d.ui.GLView;
 abstract public class ActivityState {
     protected static final int FLAG_HIDE_ACTION_BAR = 1;
     protected static final int FLAG_HIDE_STATUS_BAR = 2;
-    protected static final int FLAG_SCREEN_ON = 4;
+    protected static final int FLAG_SCREEN_ON_WHEN_PLUGGED = 4;
+    protected static final int FLAG_SCREEN_ON_ALWAYS = 8;
 
     private static final int SCREEN_ON_FLAGS = (
               WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
@@ -117,7 +118,8 @@ abstract public class ActivityState {
     void setScreenOnFlags() {
         final Window win = ((Activity) mActivity).getWindow();
         final WindowManager.LayoutParams params = win.getAttributes();
-        if (mPlugged && 0 != (mFlags & FLAG_SCREEN_ON)) {
+        if ((0 != (mFlags & FLAG_SCREEN_ON_ALWAYS)) ||
+                (mPlugged && 0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED))) {
             params.flags |= SCREEN_ON_FLAGS;
         } else {
             params.flags &= ~SCREEN_ON_FLAGS;
@@ -126,7 +128,7 @@ abstract public class ActivityState {
     }
 
     protected void onPause() {
-        if (0 != (mFlags & FLAG_SCREEN_ON)) {
+        if (0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED)) {
             ((Activity) mActivity).unregisterReceiver(mPowerIntentReceiver);
         }
     }
@@ -160,7 +162,7 @@ abstract public class ActivityState {
             onStateResult(entry.requestCode, entry.resultCode, entry.resultData);
         }
 
-        if (0 != (mFlags & FLAG_SCREEN_ON)) {
+        if (0 != (mFlags & FLAG_SCREEN_ON_WHEN_PLUGGED)) {
             // we need to know whether the device is plugged in to do this correctly
             final IntentFilter filter = new IntentFilter();
             filter.addAction(Intent.ACTION_BATTERY_CHANGED);

diff --git a/src/com/android/gallery3d/app/Gallery.java b/src/com/android/gallery3d/app/Gallery.java
index bdd4a0b..468d202 100644 (file)
--- a/src/com/android/gallery3d/app/Gallery.java
+++ b/src/com/android/gallery3d/app/Gallery.java
@@ -42,6 +42,7 @@ import com.android.gallery3d.util.GalleryUtils;
 
 public final class Gallery extends AbstractGalleryActivity implements OnCancelListener {
     public static final String EXTRA_SLIDESHOW = "slideshow";
+    public static final String EXTRA_DREAM = "dream";
     public static final String EXTRA_CROP = "crop";
 
     public static final String ACTION_REVIEW = "com.android.camera.action.REVIEW";
@@ -145,6 +146,9 @@ public final class Gallery extends AbstractGalleryActivity implements OnCancelLi
             data.putString(SlideshowPage.KEY_SET_PATH, path.toString());
             data.putBoolean(SlideshowPage.KEY_RANDOM_ORDER, true);
             data.putBoolean(SlideshowPage.KEY_REPEAT, true);
+            if (intent.getBooleanExtra(EXTRA_DREAM, false)) {
+                data.putBoolean(SlideshowPage.KEY_DREAM, true);
+            }
             getStateManager().startState(SlideshowPage.class, data);
         } else {
             Bundle data = new Bundle();

diff --git a/src/com/android/gallery3d/app/SlideshowDream.java b/src/com/android/gallery3d/app/SlideshowDream.java
index c249467..9963da6 100644 (file)
--- a/src/com/android/gallery3d/app/SlideshowDream.java
+++ b/src/com/android/gallery3d/app/SlideshowDream.java
@@ -14,6 +14,7 @@ public class SlideshowDream extends BasicDream {
 //            Uri.fromFile(Environment.getExternalStoragePublicDirectory(
 //                        Environment.DIRECTORY_PICTURES)))
                 .putExtra(Gallery.EXTRA_SLIDESHOW, true)
+                .putExtra(Gallery.EXTRA_DREAM, true)
                 .setFlags(getIntent().getFlags());
         startActivity(i);
         finish();

diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index 5aa3985..a6ae527 100644 (file)
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -48,6 +48,7 @@ public class SlideshowPage extends ActivityState {
     public static final String KEY_PHOTO_INDEX = "photo-index";
     public static final String KEY_RANDOM_ORDER = "random-order";
     public static final String KEY_REPEAT = "repeat";
+    public static final String KEY_DREAM = "dream";
 
     private static final long SLIDESHOW_DELAY = 3000; // 3 seconds
 
@@ -104,7 +105,14 @@ public class SlideshowPage extends ActivityState {
 
     @Override
     public void onCreate(Bundle data, Bundle restoreState) {
-        mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR | FLAG_SCREEN_ON);
+        mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR);
+        if (data.getBoolean(KEY_DREAM)) {
+            // Dream screensaver only keeps screen on for plugged devices.
+            mFlags |= FLAG_SCREEN_ON_WHEN_PLUGGED;
+        } else {
+            // User-initiated slideshow would always keep screen on.
+            mFlags |= FLAG_SCREEN_ON_ALWAYS;
+        }
 
         mHandler = new SynchronizedHandler(mActivity.getGLRoot()) {
             @Override