diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:48:45 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:48:45 +0100 |
| commit | 1da05f244b2f0d22a0f4457fa156a0c760a86556 (patch) | |
| tree | bccb505811e460c687406157d46bbbad02034e34 | |
| parent | d9ccb53b3392df0fcab2365c41d0c1bc9561d857 (diff) | |
| parent | 074139c69e4635f5b38b5de1aff51de7f5c735e0 (diff) | |
| download | android_packages_wallpapers_NoiseField-stable/cm-10.2.tar.gz android_packages_wallpapers_NoiseField-stable/cm-10.2.tar.bz2 android_packages_wallpapers_NoiseField-stable/cm-10.2.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2
Android 4.3 release 2.1
| -rw-r--r-- | res/values-fa/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-it/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/noisefield/NoiseFieldRS.java | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index b36cb9b..cd644ac 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="wallpaper_label" msgid="5531350352180127395">"ابزارکهای اعلان"</string> + <string name="wallpaper_label" msgid="5531350352180127395">"حبابها"</string> <string name="wallpaper_author" msgid="2347976935955560839">"Google"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 966551e..7520d67 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="wallpaper_label" msgid="5531350352180127395">"Fumetti"</string> + <string name="wallpaper_label" msgid="5531350352180127395">"Bollicine"</string> <string name="wallpaper_author" msgid="2347976935955560839">"Google"</string> </resources> diff --git a/src/com/android/noisefield/NoiseFieldRS.java b/src/com/android/noisefield/NoiseFieldRS.java index ea74db4..60edb1b 100644 --- a/src/com/android/noisefield/NoiseFieldRS.java +++ b/src/com/android/noisefield/NoiseFieldRS.java @@ -161,7 +161,9 @@ public class NoiseFieldRS { } private Allocation loadTexture(int id) { - final Allocation allocation = Allocation.createFromBitmapResource(mRS, mRes, id); + final Allocation allocation = Allocation.createFromBitmapResource(mRS, mRes, id, + Allocation.MipmapControl.MIPMAP_NONE, + Allocation.USAGE_GRAPHICS_TEXTURE); return allocation; } |