Multiples fixes

- Fully rewrite the album selection preference
- Fix multiple style
- Fix lints
- Resources cleanup

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

2 files changed, 0 insertions, 54 deletions

diff --git a/res/raw/mix_fragment_shader.glsl b/res/raw/mix_fragment_shader.glsl
deleted file mode 100644
index df80f89..0000000
--- a/res/raw/mix_fragment_shader.glsl
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod 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.
- */
-
-precision mediump float;
-
-varying vec2 vTextureCoord;
-uniform sampler2D sTexture1;
-uniform sampler2D sTexture2;
-
-void main() {
-    vec4 color1 = texture2D(sTexture1, vTextureCoord);
-    vec4 color2 = texture2D(sTexture1, vTextureCoord);
-    gl_FragColor = color2 * color1;
-}
diff --git a/res/raw/mix_vertex_shader.glsl b/res/raw/mix_vertex_shader.glsl
deleted file mode 100644
index dad4d5a..0000000
--- a/res/raw/mix_vertex_shader.glsl
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod 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.
- */
-
-uniform mat4 uMVPMatrix;
-
-attribute vec4 aPosition;
-attribute vec2 aTextureCoord;
-
-varying vec2 vTextureCoord;
-
-void main() {
-    gl_Position = uMVPMatrix * aPosition;
-    vTextureCoord = aTextureCoord;
-}