diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-10-22 09:47:11 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2013-10-22 15:07:03 +0200 |
| commit | a1e02e52035e7d7beabe1d44000f2841f158e390 (patch) | |
| tree | 2b5601506bc10a06dc12ab645343d67724770e72 | |
| parent | 418218bafcb968d7bf9d27ab863cd79e2652ac54 (diff) | |
| download | android_packages_wallpapers_PhaseBeam-a1e02e52035e7d7beabe1d44000f2841f158e390.tar.gz android_packages_wallpapers_PhaseBeam-a1e02e52035e7d7beabe1d44000f2841f158e390.tar.bz2 android_packages_wallpapers_PhaseBeam-a1e02e52035e7d7beabe1d44000f2841f158e390.zip | |
Add opt-out mechanism for wallpaper scrolling.
This allows disabling it on devices that are too slow for it.
Also add some comments for the config values and make the name for the
recolor enable flag default more clear.
Change-Id: Id853697de388daea48c0b4387e51cc4127c37e04
| -rw-r--r-- | res/values/config.xml | 7 | ||||
| -rw-r--r-- | src/com/android/phasebeam/PhaseBeamRS.java | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index acfb2ef..3e7ae7e 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -16,10 +16,13 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <bool name="enabled">false</bool> - + <!-- Whether recoloring is enabled by default --> + <bool name="recolor_enabled">false</bool> + <!-- Default values for the color controls --> <item name="hue" format="float" type="string">0.0</item> <item name="saturation" format="float" type="string">1.0</item> <item name="brightness" format="float" type="string">1.0</item> + <!-- Whether horizontal scrolling is enabled --> + <bool name="scrolling_enabled">true</bool> </resources> diff --git a/src/com/android/phasebeam/PhaseBeamRS.java b/src/com/android/phasebeam/PhaseBeamRS.java index 259d6fa..6963b4c 100644 --- a/src/com/android/phasebeam/PhaseBeamRS.java +++ b/src/com/android/phasebeam/PhaseBeamRS.java @@ -55,6 +55,7 @@ public class PhaseBeamRS implements SharedPreferences.OnSharedPreferenceChangeLi private int mDensityDPI; private SharedPreferences mSharedPref; private Context mContext; + private boolean mCanScroll; boolean mInited = false; @@ -72,6 +73,7 @@ public class PhaseBeamRS implements SharedPreferences.OnSharedPreferenceChangeLi mWidth = width; mHeight = height; + mCanScroll = mRes.getBoolean(R.bool.scrolling_enabled); mDotParticles = new ScriptField_Particle(mRS, DOT_COUNT); Mesh.AllocationBuilder smb2 = new Mesh.AllocationBuilder(mRS); @@ -126,7 +128,7 @@ public class PhaseBeamRS implements SharedPreferences.OnSharedPreferenceChangeLi private void makeNewState() { Float3 adjust; if (mSharedPref.getBoolean(PhaseBeamSelector.KEY_ENABLED, - mRes.getBoolean(R.bool.enabled))) { + mRes.getBoolean(R.bool.recolor_enabled))) { adjust = new Float3( mSharedPref.getFloat(PhaseBeamSelector.KEY_HUE, Float.valueOf(mRes.getString(R.string.hue))), @@ -205,6 +207,7 @@ public class PhaseBeamRS implements SharedPreferences.OnSharedPreferenceChangeLi float blue = new Float(values[4]); mVertexColors.set_position(i, new Float3(xPos, yPos, 0.0f), false); mVertexColors.set_color(i, new Float4(red, green, blue, 1.0f), false); + mVertexColors.set_realColor(i, new Float4(red, green, blue, 1.0f), false); mVertexColors.set_adjust(i, new Float3(-1.0f, 1.0f, 1.0f), false); } mVertexColors.copyAll(); @@ -288,7 +291,9 @@ public class PhaseBeamRS implements SharedPreferences.OnSharedPreferenceChangeLi } public void setOffset(float xOffset, float yOffset, int xPixels, int yPixels) { - mScript.set_xOffset(xOffset); + if (mCanScroll) { + mScript.set_xOffset(xOffset); + } } public void resize(int w, int h) { |