diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:48:16 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:48:16 +0100 |
| commit | cfe7affcf362280ab05c6957b4fa6fd928f72723 (patch) | |
| tree | 6d675a007972b24734ec595c37bc0eb9e3454826 | |
| parent | b9f9487b73b1675eddd104489c10e4589d447b07 (diff) | |
| parent | b02a5fb2e613245e2496ae8cab6a2cc360388274 (diff) | |
| download | android_packages_wallpapers_HoloSpiral-stable/cm-10.2.tar.gz android_packages_wallpapers_HoloSpiral-stable/cm-10.2.tar.bz2 android_packages_wallpapers_HoloSpiral-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-ca/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/wallpaper/holospiral/HoloSpiralRS.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 2d048fb..7ceb08f 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -16,7 +16,7 @@ <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="6550661498344222236">"Espiral Holo"</string> + <string name="wallpaper_label" msgid="6550661498344222236">"Espiral de Galàxia"</string> <string name="wallpaper_author" msgid="6691686743046578947">"Google"</string> - <string name="wallpaper_description" msgid="7209342332803075999">"Fons de pantalla d\'espiral amb tema Holo"</string> + <string name="wallpaper_description" msgid="7209342332803075999">"Fons de pantalla d\'espiral amb tema Galàxia"</string> </resources> diff --git a/src/com/android/wallpaper/holospiral/HoloSpiralRS.java b/src/com/android/wallpaper/holospiral/HoloSpiralRS.java index 46df13d..dfcf683 100644 --- a/src/com/android/wallpaper/holospiral/HoloSpiralRS.java +++ b/src/com/android/wallpaper/holospiral/HoloSpiralRS.java @@ -181,7 +181,9 @@ public class HoloSpiralRS { private void createTextures() { Bitmap bmp = BitmapFactory.decodeResource( mResources, R.drawable.points_red_green, null); - Allocation pointTexture = Allocation.createFromBitmap(mRS, bmp); + Allocation pointTexture = Allocation.createFromBitmap(mRS, bmp, + Allocation.MipmapControl.MIPMAP_NONE, + Allocation.USAGE_GRAPHICS_TEXTURE); mScript.set_gPointTexture(pointTexture); } |