resolved conflicts for merge of 13ef17a3 to cw-e-dev

b/22609402 Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
2015-07-23 17:08:47 -07:00
parent 494d2237b8 13ef17a37e
commit 680c92febe
630 changed files with 23771 additions and 21657 deletions
@@ -1 +1,10 @@
 db_files
+*.iml
+.project
+.classpath
+.project.properties
+gen/
+tests/stress/gen/
+WallpaperPicker/gen/
+WallpaperPicker/.project.properties
+bin/
@@ -23,28 +23,23 @@ include $(CLEAR_VARS)

 LOCAL_MODULE_TAGS := optional

-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
    $(call all-java-files-under, WallpaperPicker/src) \
-    $(call all-renderscript-files-under, src) \
    $(call all-proto-files-under, protos)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview

 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
+LOCAL_AAPT_FLAGS := --auto-add-overlay

-LOCAL_SDK_VERSION := 21
-
+LOCAL_SDK_VERSION := current
 LOCAL_PACKAGE_NAME := Launcher3
 #LOCAL_CERTIFICATE := shared

 LOCAL_OVERRIDES_PACKAGES := Home Launcher2

-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
 include $(BUILD_PACKAGE)


@@ -83,4 +78,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
 	$(copy-file-to-new-target)
 	$(hide) chmod 755 $@

+INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
 include $(call all-makefiles-under,$(LOCAL_PATH))
@@ -28,12 +28,6 @@
        android:protectionLevel="dangerous"
        android:label="@string/permlab_install_shortcut"
        android:description="@string/permdesc_install_shortcut" />
-    <permission
-        android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous"
-        android:label="@string/permlab_uninstall_shortcut"
-        android:description="@string/permdesc_uninstall_shortcut"/>
    <permission
        android:name="com.android.launcher3.permission.READ_SETTINGS"
        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
@@ -71,7 +65,6 @@
    <uses-permission android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" />

    <application
-        android:name="com.android.launcher3.LauncherApplication"
        android:allowBackup="@bool/enable_backup"
        android:backupAgent="com.android.launcher3.LauncherBackupAgentHelper"
        android:hardwareAccelerated="true"
@@ -89,6 +82,8 @@
            android:theme="@style/Theme"
            android:windowSoftInputMode="adjustPan"
            android:screenOrientation="nosensor"
+            android:resumeWhilePausing="true"
+            android:taskAffinity=""
            android:enabled="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -98,8 +93,10 @@
            </intent-filter>
        </activity>

+        <!-- ENABLE_FOR_TESTING
+
        <activity
-            android:name="com.android.launcher3.LauncherExtension"
+            android:name="com.android.launcher3.testing.LauncherExtension"
            android:launchMode="singleTask"
            android:clearTaskOnLaunch="true"
            android:stateNotNeeded="true"
@@ -115,6 +112,8 @@
            </intent-filter>
        </activity>

+        -->
+
        <activity
            android:name="com.android.launcher3.ToggleWeightWatcher"
            android:label="@string/toggle_weight_watcher"
@@ -128,7 +127,7 @@
        </activity>

        <activity
-            android:name="com.android.launcher3.LauncherWallpaperPickerActivity"
+            android:name="com.android.launcher3.WallpaperPickerActivity"
            android:theme="@style/Theme.WallpaperPicker"
            android:label="@string/pick_wallpaper"
            android:icon="@mipmap/ic_launcher_wallpaper"
@@ -154,6 +153,13 @@
            </intent-filter>
        </activity>

+        <activity
+            android:name="com.android.launcher3.SettingsActivity"
+            android:label="@string/settings_button_text"
+            android:autoRemoveFromRecents="true"
+            android:process=":settings_process">
+        </activity>
+
        <!-- Debugging tools -->
        <activity
            android:name="com.android.launcher3.MemoryDumpActivity"
@@ -191,15 +197,6 @@
            </intent-filter>
        </receiver>

-        <!-- Intent received used to uninstall shortcuts from other applications -->
-        <receiver
-            android:name="com.android.launcher3.UninstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT">
-            <intent-filter>
-                <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
-            </intent-filter>
-        </receiver>
-
        <!-- Intent received used to initialize a restored widget -->
        <receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >
            <intent-filter>
@@ -207,24 +204,6 @@
            </intent-filter>
        </receiver>

-        <!-- New user initialization; set up initial wallpaper -->
-        <receiver
-            android:name="com.android.launcher3.UserInitializeReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.USER_INITIALIZE" />
-            </intent-filter>
-        </receiver>
-
-        <receiver android:name="com.android.launcher3.PackageChangedReceiver" >
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_CHANGED"/>
-                <action android:name="android.intent.action.PACKAGE_REPLACED"/>
-                <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                <data android:scheme="package"></data>
-            </intent-filter>
-        </receiver>
-
        <receiver android:name="com.android.launcher3.StartupReceiver" >
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -5,6 +5,6 @@
        android:versionName="1.0"
        >

-    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />
-
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
+    <application/>
 </manifest>
@@ -19,7 +19,6 @@
 -->

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wallpaper_root"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    <com.android.launcher3.CropView
@@ -28,7 +27,7 @@
        android:layout_height="match_parent" />
    <ProgressBar
        android:id="@+id/loading"
-        style="@android:style/Widget.Holo.ProgressBar.Large"
+        style="?android:attr/progressBarStyleLarge"
        android:visibility="invisible"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -18,60 +18,74 @@
 */
 -->

-<com.android.launcher3.WallpaperRootView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wallpaper_root"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent" >
+
    <com.android.launcher3.CropView
        android:id="@+id/cropView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
+
    <ProgressBar
        android:id="@+id/loading"
-        style="@android:style/Widget.Holo.ProgressBar.Large"
-        android:visibility="invisible"
+        style="?android:attr/progressBarStyleLarge"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
        android:indeterminate="true"
        android:indeterminateOnly="true"
-        android:background="@android:color/transparent" />
+        android:visibility="invisible" />
+
    <LinearLayout
        android:id="@+id/wallpaper_strip"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        android:fitsSystemWindows="true"
        android:orientation="vertical" >
+
        <View
            android:layout_width="match_parent"
            android:layout_height="2dp"
            android:background="@drawable/tile_shadow_top" />
+
        <HorizontalScrollView
            android:id="@+id/wallpaper_scroll_container"
            android:layout_width="match_parent"
            android:layout_height="wrap_content" >
-            <LinearLayout android:id="@+id/master_wallpaper_list"
+
+            <LinearLayout
+                android:id="@+id/master_wallpaper_list"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:orientation="horizontal" >
-                <LinearLayout android:id="@+id/wallpaper_list"
+
+                <LinearLayout
+                    android:id="@+id/wallpaper_list"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal" />
-                <LinearLayout android:id="@+id/live_wallpaper_list"
+
+                <LinearLayout
+                    android:id="@+id/live_wallpaper_list"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal" />
-                <LinearLayout android:id="@+id/third_party_wallpaper_list"
+
+                <LinearLayout
+                    android:id="@+id/third_party_wallpaper_list"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:orientation="horizontal" />
            </LinearLayout>
        </HorizontalScrollView>
+
        <View
            android:layout_width="match_parent"
            android:layout_height="2dp"
            android:background="@drawable/tile_shadow_bottom" />
    </LinearLayout>
-</com.android.launcher3.WallpaperRootView>
+
+</FrameLayout>
@@ -20,7 +20,6 @@
    android:layout_height="@dimen/wallpaperThumbnailHeight"
    android:focusable="true"
    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
    android:foreground="@drawable/wallpaper_tile_fg">
    <ImageView
        android:id="@+id/wallpaper_image"
@@ -20,7 +20,6 @@
    android:layout_height="@dimen/wallpaperThumbnailHeight"
    android:focusable="true"
    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
    android:foreground="@drawable/wallpaper_tile_fg">
    <ImageView
        android:id="@+id/wallpaper_image"
@@ -20,7 +20,6 @@
    android:layout_height="@dimen/wallpaperThumbnailHeight"
    android:focusable="true"
    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
    android:foreground="@drawable/wallpaper_tile_fg">
    <ImageView
        android:id="@+id/wallpaper_image"
@@ -20,7 +20,6 @@
    android:layout_height="@dimen/wallpaperThumbnailHeight"
    android:focusable="true"
    android:clickable="true"
-    android:background="@drawable/wallpaper_tile_fg"
    android:foreground="@drawable/wallpaper_tile_fg">
    <ImageView
        android:id="@+id/wallpaper_image"
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Muurpapier %1$d van %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Vee uit"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Kies prent"</string>
+    <string name="pick_image" msgid="3189640419551368385">"My foto\'s"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Muurpapiere"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Snoei muurpapier"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ልጣፍ  %1$d የ%2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ሰርዝ"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ምስል ይምረጡ"</string>
+    <string name="pick_image" msgid="3189640419551368385">"የእኔ ፎቶዎች"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ልጣፍ  ይከርክሙ"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏الخلفية %1$d من %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف"</string>
-    <string name="pick_image" msgid="6704438906027442697">"اختيار صورة"</string>
+    <string name="pick_image" msgid="3189640419551368385">"صوري"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"الخلفيات"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"اقتصاص الخلفية"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Divar kağızı %1$d of %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seçilib"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Sil"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Şəkil seçin"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Fotolarım"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Divar kağızları"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Divar kağızını kəsin"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Тапет %1$d от %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Избрахте <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Изтриване"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Избиране на изображение"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Моите снимки"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Тапети"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Подрязване на тапета"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$dটির মধ্যে %1$dটি ওয়ালপেপার"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> নির্বাচন করা হয়েছে"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"মুছুন"</string>
-    <string name="pick_image" msgid="6704438906027442697">"চিত্র বাছুন"</string>
+    <string name="pick_image" msgid="3189640419551368385">"আমার ফটো"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"ওয়ালপেপারগুলি"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ওয়ালপেপার কাটছাঁট করুন"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fons de pantalla %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"S\'ha seleccionat <xliff:g id="LABEL">%1$s</xliff:g>."</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Suprimeix"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Tria una imatge"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Les meves fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fons de pantalla"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Retallar fons de pantalla"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Vybrána položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Smazat"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Vybrat obrázek"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Moje fotografie"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Oříznutí tapety"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Baggrund %1$d af %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> blev valgt"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Slet"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Vælg et billede"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mine billeder"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Baggrunde"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskær baggrunden"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Hintergrund %1$d von %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ausgewählt"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Löschen"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Bild auswählen"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Meine Fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Hintergründe"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Hintergrund zuschneiden"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Ταπετσαρία %1$d από %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Επιλέχθηκε το <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Διαγραφή"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Επιλογή εικόνας"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Οι φωτογραφίες μου"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Ταπετσαρίες"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Περικοπή ταπετσαρίας"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_image" msgid="3189640419551368385">"My photos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_image" msgid="3189640419551368385">"My photos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d of %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Selected <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Delete"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pick image"</string>
+    <string name="pick_image" msgid="3189640419551368385">"My photos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpapers"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Crop wallpaper"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Elegir imagen"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mis fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seleccionado"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Seleccionar imagen"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mis fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d taustapildist"</string>
    <string name="announce_selection" msgid="123723511662250539">"Valitud on <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Kustuta"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Vali kujutis"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Minu fotod"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Taustapildid"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Taustapildi kärpimine"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d horma-papera"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> hautatu da"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Ezabatu"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Hautatu irudia"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Nire argazkiak"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Horma-paperak"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Ebaki horma-papera"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏کاغذدیواری %1$d از %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> انتخاب شد"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف"</string>
-    <string name="pick_image" msgid="6704438906027442697">"انتخاب تصویر"</string>
+    <string name="pick_image" msgid="3189640419551368385">"عکس‌های من"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"کاغذدیواری‌ها"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"برش کاغذدیواری"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Taustakuva %1$d/%2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Valittu: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Poista"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Valitse kuva"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Omat valokuvat"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Taustakuvat"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Rajaa taustakuva"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fond d\'écran %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Sélection : <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Choisir une image"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mes photos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fond d\'écran %1$d sur %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> sélectionné"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Sélectionner une image"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mes photos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Recadrer le fond d\'écran"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fondo de pantalla %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Seleccionaches <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Escoller imaxe"</string>
+    <string name="pick_image" msgid="3189640419551368385">"As miñas fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fondos de pantalla"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar fondo de pantalla"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d માંથી %1$d વૉલપેપર"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> પસંદ કર્યો"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"કાઢી નાખો"</string>
-    <string name="pick_image" msgid="6704438906027442697">"છબી ચૂંટો"</string>
+    <string name="pick_image" msgid="3189640419551368385">"મારા ફોટા"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"વૉલપેપર્સ"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"વૉલપેપર કાપો"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"वॉलपेपर %2$d में से %1$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"चयनित <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"हटाएं"</string>
-    <string name="pick_image" msgid="6704438906027442697">"चित्र चुनें"</string>
+    <string name="pick_image" msgid="3189640419551368385">"मेरी फ़ोटो"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"वॉलपेपर"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"वॉलपेपर काटें"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. pozadinska slika od %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Odabrana je <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Odaberi sliku"</string>
-    <string name="pick_wallpaper" msgid="4628969645948454559">"Pozadinske slike"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Moje fotografije"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Pozadine"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Obrezivanje pozadinske slike"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d/%2$d. háttérkép"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> kiválasztva"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Törlés"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Kép kiválasztása"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Saját fotók"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Háttérképek"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Háttérkép körbevágása"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d պաստառ՝ %2$d-ից"</string>
    <string name="announce_selection" msgid="123723511662250539">"Ընտրված է <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Ջնջել"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Ընտրել պատկեր"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Իմ լուսանկարները"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Պաստառներ"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Եզրատել պաստառը"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d dari %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> terpilih"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Hapus"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pilih gambar"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Foto saya"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Wallpaper"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Pangkas wallpaper"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Veggfóður %1$d af %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> valið"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Eyða"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Velja mynd"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Myndirnar mínar"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Veggfóður"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Skera veggfóður"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Sfondo %1$d di %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Elemento selezionato: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Elimina"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Scegli l\'immagine"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Le mie foto"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Sfondi"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Ritaglia sfondo"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏טפט %1$d מתוך %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"בחרת <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"מחק"</string>
-    <string name="pick_image" msgid="6704438906027442697">"בחר תמונה"</string>
+    <string name="pick_image" msgid="3189640419551368385">"התמונות שלי"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"טפטים"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"חתוך את הטפט"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"壁紙: %1$d/%2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"選択: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"削除"</string>
-    <string name="pick_image" msgid="6704438906027442697">"画像を選択"</string>
+    <string name="pick_image" msgid="3189640419551368385">"マイフォト"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"壁紙"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"壁紙のトリミング"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ფონი %1$d %2$d-დან"</string>
    <string name="announce_selection" msgid="123723511662250539">"არჩეული <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"წაშლა"</string>
-    <string name="pick_image" msgid="6704438906027442697">"სურათის ამორჩევა"</string>
+    <string name="pick_image" msgid="3189640419551368385">"ჩემი ფოტოები"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"ფონები"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ფონის ჩამოჭრა"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d артқы фон, барлығы %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> таңдалған"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Жою"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Суретті таңдау"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Менің фотосуреттерім"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Артқы фондар"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Артқы фонды кесу"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ផ្ទាំងរូបភាព %1$d នៃ %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"បានជ្រើស <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"លុប"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ជ្រើសយករូបភាព"</string>
+    <string name="pick_image" msgid="3189640419551368385">"រូបថតរបស់ខ្ញុំ"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"ផ្ទាំងរូបភាព"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ច្រឹបផ្ទាំងរូបភាព"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d ರಲ್ಲಿ %1$d ವಾಲ್‌ಪೇಪರ್‌"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ಅಳಿಸು"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ಚಿತ್ರವನ್ನು ಆರಿಸಿ"</string>
+    <string name="pick_image" msgid="3189640419551368385">"ನನ್ನ ಫೋಟೋಗಳು"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"ವಾಲ್‌ಪೇಪರ್‌ಗಳು"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ವಾಲ್‌ಪೇಪರ್‌ ಕತ್ತರಿಸಿ"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"배경화면 %1$d/%2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> 선택함"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"삭제"</string>
-    <string name="pick_image" msgid="6704438906027442697">"이미지 선택"</string>
+    <string name="pick_image" msgid="3189640419551368385">"내 사진"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"배경화면"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"배경화면 잘라내기"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d ичинен %1$d тушкагаз"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> тандалды"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Жок кылуу"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Сүрөт тандоо"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Менин сүрөттөрүм"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Тушкагаздар"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Тушкагазды тегиздөө"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ພາບພື້ນຫຼັງ %1$d ໃນ %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"ເລືອກ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ລຶບ"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ເລືອກຮູບພາບ"</string>
+    <string name="pick_image" msgid="3189640419551368385">"ຮູບຂອງຂ້ອຍ"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"ພາບພື້ນຫຼັງ"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ຕັດພາບພື້ນຫຼັງ"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d ekrano fonas iš %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Pasirinkta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Ištrinti"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pasirinkti vaizdą"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mano nuotraukos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Ekrano fonai"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Apkirpti ekrano foną"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. fona tapete no %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Atlasīta: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Dzēst"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Izvēlēties attēlu"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mani fotoattēli"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Fona tapetes"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Apgriezt fona tapeti"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Тапет %1$d од %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Избран <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Избриши"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Избери слика"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Моите фотографии"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Тапети"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Исечи тапет"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d / %2$d വാൾപേപ്പർ"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> തിരഞ്ഞെടുത്തു"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ഇല്ലാതാക്കുക"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ചിത്രം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="pick_image" msgid="3189640419551368385">"എന്റെ ഫോട്ടോകൾ"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"വാൾപേപ്പറുകൾ"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"വാൾപേപ്പറിന്റെ വലുപ്പം മാറ്റൽ"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d ханын цаасны %1$d нь"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> сонгогдсон"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Устгах"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Зураг сонгох"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Миний зураг"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Ханын зураг"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Ханын зургийг тайрах"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d पैकी %1$d वॉलपेपर"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> निवडले"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"हटवा"</string>
-    <string name="pick_image" msgid="6704438906027442697">"प्रतिमा निवडा"</string>
+    <string name="pick_image" msgid="3189640419551368385">"माझे फोटो"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"वॉलपेपर"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"वॉलपेपर कापा"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Kertas dinding %1$d daripada %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Memilih <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Padam"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pilih imej"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Foto saya"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Kertas dinding"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Pangkas kertas dinding"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"နောက်ခံ %1$d မှ %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"ရွေးချယ်ထားသော <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ဖျက်ပါ"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ပုံ ရွေးပါ"</string>
+    <string name="pick_image" msgid="3189640419551368385">"ကျွန်ုပ်၏ ဓာတ်ပုံများ"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"နောက်ခံများ"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"နောက်ခံအား ဖြတ်ခြင်း"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Bakgrunn %1$d av %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Valgt <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Slett"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Velg bilde"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mine bilder"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Bakgrunner"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskjær bakgrunnen"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d को %1$d वालपेपर"</string>
    <string name="announce_selection" msgid="123723511662250539">"चयन गरिएको <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"मेट्नुहोस्"</string>
-    <string name="pick_image" msgid="6704438906027442697">"तस्बिर छान्नुहोस्"</string>
+    <string name="pick_image" msgid="3189640419551368385">"मेरा तस्बिरहरू"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"वालपेपरहरु"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"वालपेपर काँटछाट गर्नुहोस्"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Achtergrond %1$d van %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> is geselecteerd"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Verwijderen"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Afbeelding kiezen"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mijn foto\'s"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Achtergronden"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Achtergrond bijsnijden"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ਵਾਲਪੇਪਰ %2$d ਦਾ %1$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ਚੁਣਿਆ ਗਿਆ"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ਮਿਟਾਓ"</string>
-    <string name="pick_image" msgid="6704438906027442697">"ਚਿੱਤਰ ਚੁਣੋ"</string>
+    <string name="pick_image" msgid="3189640419551368385">"ਮੇਰੀਆਂ ਫੋਟੋਆਂ"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"ਵਾਲਪੇਪਰ"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ਵਾਲਪੇਪਰ ਕੱਟੋ"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Wybrano <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Usuń"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Wybierz obraz"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Moje zdjęcia"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Przytnij tapetę"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imagem de fundo %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> selecionada"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Eliminar"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Escolher imagem"</string>
+    <string name="pick_image" msgid="3189640419551368385">"As minhas fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Imagens de fundo"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Recortar imagem de fundo"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Plano de fundo %1$d de %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> selecionado"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Excluir"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Escolher imagem"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Minhas fotos"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Planos de fundo"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Cortar plano de fundo"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imaginea de fundal %1$d din %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"S-a selectat <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Ștergeți"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Alegeți imaginea"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Fotografiile mele"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Imagini de fundal"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Decupați imaginea de fundal"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Обои %1$d из %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Выбран элемент \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Удалить"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Выбрать обои"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Мои фото"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Обои"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Кадрировать обои"</string>
 </resources>
@@ -32,7 +32,7 @@
    <skip />
    <string name="announce_selection" msgid="123723511662250539">"තෝරාගත්තේ <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"මකන්න"</string>
-    <string name="pick_image" msgid="6704438906027442697">"පින්තූරයක් තෝරන්න"</string>
+    <string name="pick_image" msgid="3189640419551368385">"මගේ ඡායාරූප"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"වෝල්පේපර"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"වෝල්පේපරය කප්පාදු කිරීම"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Tapeta %1$d z %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Vybratá položka <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Odstrániť"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Vybrať obrázok"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Moje fotky"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Tapety"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Orezanie tapety"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%1$d. ozadje od %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Izbrano: <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Izberi sliko"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Moje fotografije"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Ozadja"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Obrezovanje ozadja"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Imazhi i sfondit: %1$d nga gjithsej %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> u përzgjodh"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Fshi"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Zgjidh imazhin"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Fotografitë e mia"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Imazhet e sfondit"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Prit imazhin e sfondit"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Позадина %1$d од %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Изабрана је <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Избриши"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Изабери слику"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Моје фотографије"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Позадине"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Опсеци позадину"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Bakgrund %1$d av %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> har valts"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Ta bort"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Välj bild"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mina foton"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Bakgrunder"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Beskär bakgrund"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Mandhari %1$d ya %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> iliyochaguliwa"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Futa"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Chagua picha"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Picha zangu"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Mandhari"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Punguza mandhari"</string>
 </resources>
@@ -18,7 +18,7 @@
 -->

 <resources>
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+    <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar">
        <item name="android:windowActionModeOverlay">true</item>
        <item name="android:windowTranslucentStatus">true</item>
        <item name="android:windowTranslucentNavigation">true</item>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
-->
-
-<resources>
-    <dimen name="app_icon_size">72dp</dimen>
-
-<!-- QSB -->
-    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
-
-    <!-- When dragging items on the workspace, the number of dps by which the position of
-     the drag view should be offset from the position of the original view. -->
-    <dimen name="dragViewOffsetX">0dp</dimen>
-    <dimen name="dragViewOffsetY">0dp</dimen>
-</resources>
@@ -18,7 +18,7 @@
 -->

 <resources>
-    <style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
+    <style name="Theme" parent="@android:style/Theme.DeviceDefault.Wallpaper.NoTitleBar">
        <item name="android:windowActionModeOverlay">true</item>
    </style>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"வால்பேப்பர் %1$d / %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"நீக்கு"</string>
-    <string name="pick_image" msgid="6704438906027442697">"படத்தைத் தேர்வுசெய்க"</string>
+    <string name="pick_image" msgid="3189640419551368385">"எனது படங்கள்"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"வால்பேப்பர்கள்"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"வால்பேப்பரைச் செதுக்கு"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$dలో %1$dవ వాల్‌పేపర్"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ఎంచుకోబడింది"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"తొలగించు"</string>
-    <string name="pick_image" msgid="6704438906027442697">"చిత్రాన్ని ఎంచుకోండి"</string>
+    <string name="pick_image" msgid="3189640419551368385">"నా ఫోటోలు"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"వాల్‌పేపర్‌లు"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"వాల్‌పేపర్‌ను కత్తిరించండి"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"วอลเปเปอร์ %1$d จาก %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"เลือก <xliff:g id="LABEL">%1$s</xliff:g> แล้ว"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"ลบ"</string>
-    <string name="pick_image" msgid="6704438906027442697">"เลือกรูปภาพ"</string>
+    <string name="pick_image" msgid="3189640419551368385">"รูปภาพของฉัน"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"วอลเปเปอร์"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"ครอบตัดวอลเปเปอร์"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Wallpaper %1$d ng %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Napili ang <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Tanggalin"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Pumili ng larawan"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Aking mga larawan"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Mga Wallpaper"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"I-crop ang wallpaper"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"%2$d duvar kağıdı arasından duvar kağıdı %1$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seçildi"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Sil"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Resim seç"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Fotoğraflarım"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Duvar kağıtları"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Duvar kağıdını kırp"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Фоновий малюнок %1$d з %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"Вибрано <xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Видалити"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Вибрати зображення"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Мої фото"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Фонові малюнки"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Обрізати фоновий малюнок"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏وال پیپر ‎%1$d از ‎%2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> کو منتخب کیا گیا"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"حذف کریں"</string>
-    <string name="pick_image" msgid="6704438906027442697">"تصویر منتخب کریں"</string>
+    <string name="pick_image" msgid="3189640419551368385">"میری تصاویر"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"وال پیپرز"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"وال پیپر کو تراشیں"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Fon rasmi %2$ddan %1$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> tanlandi"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"O‘chirish"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Rasm tanlang"</string>
-    <string name="pick_wallpaper" msgid="4628969645948454559">"Orqa fon rasmlari"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Mening rasmlarim"</string>
+    <string name="pick_wallpaper" msgid="4628969645948454559">"Fon rasmlari"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Fon rasmini kesish"</string>
 </resources>
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2015 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.
+*/
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="WallpaperCropperActionBar" parent="@android:style/Widget.DeviceDefault.ActionBar">
+        <item name="android:displayOptions">showCustom</item>
+        <item name="android:background">#88000000</item>
+        <item name="android:contentInsetEnd">0dp</item>
+        <item name="android:contentInsetLeft">0dp</item>
+        <item name="android:contentInsetRight">0dp</item>
+        <item name="android:contentInsetStart">0dp</item>
+    </style>
+
+    <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">
+        <item name="android:textColor">#ffffffff</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+    </style>
+
+</resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Hình nền %1$d / %2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> được chọn"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Xóa"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Chọn hình ảnh"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Ảnh của tôi"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Hình nền"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Cắt hình nền"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第%1$d张壁纸，共%2$d张"</string>
    <string name="announce_selection" msgid="123723511662250539">"已选择<xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"删除"</string>
-    <string name="pick_image" msgid="6704438906027442697">"选择图片"</string>
+    <string name="pick_image" msgid="3189640419551368385">"我的照片"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"壁纸"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"剪裁壁纸"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
    <string name="announce_selection" msgid="123723511662250539">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
-    <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
+    <string name="pick_image" msgid="3189640419551368385">"我的相片"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"裁剪桌布"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"第 %1$d 張桌布，共 %2$d 張"</string>
    <string name="announce_selection" msgid="123723511662250539">"已選取<xliff:g id="LABEL">%1$s</xliff:g>"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"刪除"</string>
-    <string name="pick_image" msgid="6704438906027442697">"選擇圖片"</string>
+    <string name="pick_image" msgid="3189640419551368385">"我的相片"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"桌布"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"裁剪桌布"</string>
 </resources>
@@ -30,7 +30,7 @@
    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Isithombe sangemuva esingu-%1$d kwezingu-%2$d"</string>
    <string name="announce_selection" msgid="123723511662250539">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhethiwe"</string>
    <string name="wallpaper_delete" msgid="1459353972739215344">"Susa"</string>
-    <string name="pick_image" msgid="6704438906027442697">"Khetha isithombe"</string>
+    <string name="pick_image" msgid="3189640419551368385">"Izithombe zami"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Izithombe zangemuva"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Nqampuna isithombe sangemuva"</string>
 </resources>
@@ -14,7 +14,6 @@
     limitations under the License.
 -->
 <resources>
-    <bool name="allow_rotation">false</bool>
    <!-- Specifies whether to expand the cropped area on both sides (rather
         than just to one side) -->
    <bool name="center_crop">false</bool>
@@ -45,7 +45,7 @@
    <!-- Label on button to delete wallpaper(s) -->
    <string name="wallpaper_delete">Delete</string>
    <!-- Label on button in Wallpaper Picker to pick an image -->
-    <string name="pick_image">Pick image</string>
+    <string name="pick_image">My photos</string>
    <!-- Option in "Select wallpaper from" dialog box -->
    <string name="pick_wallpaper">Wallpapers</string>
    <!-- Title of activity for cropping wallpapers -->
@@ -17,7 +17,7 @@
 */
 -->

-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
    <style name="Theme.WallpaperCropper" parent="@android:style/Theme.DeviceDefault">
        <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item>
        <item name="android:windowFullscreen">true</item>
@@ -40,5 +40,6 @@

    <style name="ActionBarSetWallpaperStyle" parent="@android:style/Widget.DeviceDefault.ActionButton">
        <item name="android:textColor">#ffffffff</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
    </style>
 </resources>
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-package android.util;
-
-/**
- * Helper class for crating pools of objects. An example use looks like this:
- * <pre>
- * public class MyPooledClass {
- *
- *     private static final SynchronizedPool<MyPooledClass> sPool =
- *             new SynchronizedPool<MyPooledClass>(10);
- *
- *     public static MyPooledClass obtain() {
- *         MyPooledClass instance = sPool.acquire();
- *         return (instance != null) ? instance : new MyPooledClass();
- *     }
- *
- *     public void recycle() {
- *          // Clear state if needed.
- *          sPool.release(this);
- *     }
- *
- *     . . .
- * }
- * </pre>
- *
- * @hide
- */
-public final class Pools {
-
-    /**
-     * Interface for managing a pool of objects.
-     *
-     * @param <T> The pooled type.
-     */
-    public static interface Pool<T> {
-
-        /**
-         * @return An instance from the pool if such, null otherwise.
-         */
-        public T acquire();
-
-        /**
-         * Release an instance to the pool.
-         *
-         * @param instance The instance to release.
-         * @return Whether the instance was put in the pool.
-         *
-         * @throws IllegalStateException If the instance is already in the pool.
-         */
-        public boolean release(T instance);
-    }
-
-    private Pools() {
-        /* do nothing - hiding constructor */
-    }
-
-    /**
-     * Simple (non-synchronized) pool of objects.
-     *
-     * @param <T> The pooled type.
-     */
-    public static class SimplePool<T> implements Pool<T> {
-        private final Object[] mPool;
-
-        private int mPoolSize;
-
-        /**
-         * Creates a new instance.
-         *
-         * @param maxPoolSize The max pool size.
-         *
-         * @throws IllegalArgumentException If the max pool size is less than zero.
-         */
-        public SimplePool(int maxPoolSize) {
-            if (maxPoolSize <= 0) {
-                throw new IllegalArgumentException("The max pool size must be > 0");
-            }
-            mPool = new Object[maxPoolSize];
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public T acquire() {
-            if (mPoolSize > 0) {
-                final int lastPooledIndex = mPoolSize - 1;
-                T instance = (T) mPool[lastPooledIndex];
-                mPool[lastPooledIndex] = null;
-                mPoolSize--;
-                return instance;
-            }
-            return null;
-        }
-
-        @Override
-        public boolean release(T instance) {
-            if (isInPool(instance)) {
-                throw new IllegalStateException("Already in the pool!");
-            }
-            if (mPoolSize < mPool.length) {
-                mPool[mPoolSize] = instance;
-                mPoolSize++;
-                return true;
-            }
-            return false;
-        }
-
-        private boolean isInPool(T instance) {
-            for (int i = 0; i < mPoolSize; i++) {
-                if (mPool[i] == instance) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Synchronized) pool of objects.
-     *
-     * @param <T> The pooled type.
-     */
-    public static class SynchronizedPool<T> extends SimplePool<T> {
-        private final Object mLock = new Object();
-
-        /**
-         * Creates a new instance.
-         *
-         * @param maxPoolSize The max pool size.
-         *
-         * @throws IllegalArgumentException If the max pool size is less than zero.
-         */
-        public SynchronizedPool(int maxPoolSize) {
-            super(maxPoolSize);
-        }
-
-        @Override
-        public T acquire() {
-            synchronized (mLock) {
-                return super.acquire();
-            }
-        }
-
-        @Override
-        public boolean release(T element) {
-            synchronized (mLock) {
-                return super.release(element);
-            }
-        }
-    }
-}
--- a/Show More
+++ b/Show More