Multiples fixes

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

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

45 files changed, 231 insertions, 311 deletions

diff --git a/res/anim/cards_animation_up_left.xml b/res/anim/cards_slide_up.xml
index 6d97f6c..6da2e69 100644
--- a/res/anim/cards_animation_up_left.xml
+++ b/res/anim/cards_slide_up.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
+     Copyright (C) 2013 Ahmed Nammari
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,22 +16,17 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator" >
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+    android:fillAfter="true">
 
     <translate
-        android:duration="@integer/cards_slide_anim"
+        android:duration="@integer/cards_slide_up_anim"
         android:fromYDelta="100%p"
         android:toYDelta="0" />
 
     <alpha
-        android:duration="@integer/cards_slide_anim"
+        android:duration="@integer/cards_slide_up_anim"
         android:fromAlpha="0.0"
         android:toAlpha="1.0" />
 
-    <rotate
-        android:duration="@integer/cards_slide_anim"
-        android:fromDegrees="25"
-        android:pivotX="0"
-        android:pivotY="0"
-        android:toDegrees="0" />
 </set>
\ No newline at end of file
diff --git a/res/anim/display_with_bounce.xml b/res/anim/display_with_bounce.xml
index 3f5a5ad..0a51b53 100644
--- a/res/anim/display_with_bounce.xml
+++ b/res/anim/display_with_bounce.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/anim/cards_animation_up_right.xml b/res/anim/picture_animation.xml
index 7b4ef0d..acf7b83 100644
--- a/res/anim/cards_animation_up_right.xml
+++ b/res/anim/picture_animation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,22 +15,10 @@
      limitations under the License.
 -->
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator" >
-
-    <translate
-        android:duration="@integer/cards_slide_anim"
-        android:fromYDelta="100%p"
-        android:toYDelta="0" />
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator" >
 
     <alpha
-        android:duration="@integer/cards_slide_anim"
+        android:duration="400"
         android:fromAlpha="0.0"
         android:toAlpha="1.0" />
-
-    <rotate
-        android:duration="@integer/cards_slide_anim"
-        android:fromDegrees="-25"
-        android:pivotX="100%"
-        android:pivotY="0"
-        android:toDegrees="0" />
 </set>
\ No newline at end of file
diff --git a/res/anim/pictures_layout_animation.xml b/res/anim/pictures_layout_animation.xml
new file mode 100644
index 0000000..95efcaf
--- /dev/null
+++ b/res/anim/pictures_layout_animation.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+    android:animation="@anim/picture_animation"
+    android:delay="5%" />
diff --git a/res/animator/cards_rotate_animator.xml b/res/animator/cards_rotate_animator.xml
new file mode 100644
index 0000000..96bca35
--- /dev/null
+++ b/res/animator/cards_rotate_animator.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 Ahmed Nammari
+     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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/cards_rotate_anim"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:propertyName="rotationX"
+    android:repeatCount="0"
+    android:valueFrom="75"
+    android:valueTo="0"
+    android:valueType="floatType" />
diff --git a/res/drawable-xhdpi/wallpaper_thumb.png b/res/drawable-xhdpi/wallpaper_thumb.png
deleted file mode 100644
index 381b7ed..0000000
--- a/res/drawable-xhdpi/wallpaper_thumb.png
+++ /dev/null
diff --git a/res/drawable/card.xml b/res/drawable/card.xml
index 3dd2638..1fe0b38 100644
--- a/res/drawable/card.xml
+++ b/res/drawable/card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/drawable/holo_selector.xml b/res/drawable/holo_selector.xml
index 1f2f5b6..8ebf30e 100644
--- a/res/drawable/holo_selector.xml
+++ b/res/drawable/holo_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/layout/album_info.xml b/res/layout/album_info.xml
index fc44edd..fa0e30e 100644
--- a/res/layout/album_info.xml
+++ b/res/layout/album_info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,66 +14,73 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/PhotoPhase.Album">
+    android:layout_height="wrap_content">
 
-    <ImageView android:id="@+id/album_thumbnail"
-        android:layout_width="@dimen/album_size"
-        android:layout_height="@dimen/album_size"
-        android:scaleType="fitXY"
-        android:layout_marginRight="@dimen/album_margin"
-        android:contentDescription="@null"
-        style="@style/PhotoPhase.Album.Thumbnail" />
-
-   <TextView android:id="@+id/album_selected_items"
-        android:layout_width="wrap_content"
+    <org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfoView
+        android:id="@+id/album_info"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignRight="@id/album_thumbnail"
-        android:layout_alignBottom="@id/album_thumbnail"
-        style="@style/PhotoPhase.Notification" />
+        style="@style/PhotoPhase.Album">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_toRightOf="@id/album_thumbnail"
-        android:layout_alignTop="@id/album_thumbnail"
-        android:layout_alignBottom="@id/album_thumbnail"
-        android:orientation="vertical"
-        style="@style/PhotoPhase.Album.Info">
+        <ImageView android:id="@+id/album_thumbnail"
+            android:layout_width="@dimen/album_size"
+            android:layout_height="@dimen/album_size"
+            android:scaleType="fitXY"
+            android:layout_marginRight="@dimen/album_margin"
+            android:contentDescription="@null"
+            style="@style/PhotoPhase.Album.Thumbnail" />
 
-        <TextView android:id="@+id/album_name"
+        <TextView android:id="@+id/album_selected_items"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingBottom="@dimen/album_info_margin"
-            android:gravity="bottom"
-            android:ellipsize="end"
-            android:singleLine="true"
-            style="@style/PhotoPhase.TextAppearance.Primary" />
+            android:layout_alignRight="@id/album_thumbnail"
+            android:layout_alignBottom="@id/album_thumbnail"
+            style="@style/PhotoPhase.Notification" />
 
-        <TextView android:id="@+id/album_items"
+        <ImageView android:id="@+id/overflow_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingTop="@dimen/album_info_margin"
-            android:gravity="top"
-            android:ellipsize="end"
-            android:singleLine="true"
-            style="@style/PhotoPhase.TextAppearance.Secondary" />
+            android:layout_alignParentRight="true"
+            android:layout_alignBottom="@id/album_thumbnail"
+            android:layout_gravity="top"
+            android:padding="@dimen/small_padding"
+            android:contentDescription="@null"
+            style="@style/PhotoPhase.Album.MenuBar.Overflow" />
 
-    </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@id/album_thumbnail"
+            android:layout_toLeftOf="@id/overflow_button"
+            android:layout_alignTop="@id/album_thumbnail"
+            android:layout_alignBottom="@id/album_thumbnail"
+            android:orientation="vertical"
+            style="@style/PhotoPhase.Album.Info">
 
-    <ImageView android:id="@+id/overflow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignBottom="@id/album_thumbnail"
-        android:layout_gravity="top"
-        android:padding="@dimen/small_padding"
-        android:contentDescription="@null"
-        style="@style/PhotoPhase.Album.MenuBar.Overflow" />
+            <TextView android:id="@+id/album_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingBottom="@dimen/album_info_margin"
+                android:gravity="bottom"
+                android:ellipsize="end"
+                android:singleLine="true"
+                style="@style/PhotoPhase.TextAppearance.Primary" />
+
+            <TextView android:id="@+id/album_items"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingTop="@dimen/album_info_margin"
+                android:gravity="top"
+                android:ellipsize="end"
+                android:singleLine="true"
+                style="@style/PhotoPhase.TextAppearance.Secondary" />
+
+        </LinearLayout>
 
-</org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfo>
+    </org.cyanogenmod.wallpapers.photophase.widgets.AlbumInfoView>
+</FrameLayout>
diff --git a/res/layout/album_pictures.xml b/res/layout/album_pictures.xml
deleted file mode 100644
index 6b42ca1..0000000
--- a/res/layout/album_pictures.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-     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.
--->
-<org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/card"
-    style="@style/PhotoPhase.Album">
-
-    <TextView android:id="@+id/album_pictures_title"
-        android:layout_width="@dimen/album_size"
-        android:layout_height="@dimen/album_title_height"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        style="@style/PhotoPhase.Album.Title" />
-
-    <LinearLayout android:id="@+id/album_menubar"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/album_size"
-        android:layout_marginLeft="@dimen/small_margin"
-        android:layout_marginRight="@dimen/small_margin"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:orientation="vertical">
-
-        <ImageView android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:contentDescription="@null"
-            style="@style/PhotoPhase.Album.MenuBar.Return" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"/>
-
-        <ImageView android:id="@+id/overflow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:contentDescription="@null"
-            style="@style/PhotoPhase.Album.MenuBar.Overflow" />
-    </LinearLayout>
-
-    <org.cyanogenmod.wallpapers.photophase.widgets.PicturesView
-        android:id="@+id/album_pictures_scroller"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/album_title_height"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/album_menubar"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        android:layout_weight="1">
-
-        <LinearLayout android:id="@+id/album_pictures_holder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <!-- Pictures go here -->
-
-        </LinearLayout>
-    </org.cyanogenmod.wallpapers.photophase.widgets.PicturesView>
-
-</org.cyanogenmod.wallpapers.photophase.widgets.AlbumPictures>
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml
index 1267f2e..a72f148 100644
--- a/res/layout/choose_disposition_fragment.xml
+++ b/res/layout/choose_disposition_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/layout/choose_picture_fragment.xml b/res/layout/choose_picture_fragment.xml
index 1df53fa..8966c74 100644
--- a/res/layout/choose_picture_fragment.xml
+++ b/res/layout/choose_picture_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,20 +14,22 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<org.cyanogenmod.wallpapers.photophase.widgets.VerticalEndlessScroller
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    android:scrollbars="none">
+    android:layout_height="match_parent">
 
-    <org.cyanogenmod.wallpapers.photophase.widgets.CardLayout
+    <!-- Albums card view -->
+    <ListView
         android:id="@+id/albums_panel"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="@dimen/small_margin" />
+        android:layout_height="match_parent"
+        android:persistentDrawingCache="animation|scrolling"
+        android:listSelector="@android:color/transparent"
+        android:divider="@android:color/transparent"
+        android:dividerHeight="@dimen/one_dp"
+        android:paddingTop="@dimen/small_margin"
+        android:paddingBottom="@dimen/small_padding"
+        android:scrollbars="none"/>
 
-</org.cyanogenmod.wallpapers.photophase.widgets.VerticalEndlessScroller>
+</FrameLayout>
 
diff --git a/res/layout/color_picker_pref_item.xml b/res/layout/color_picker_pref_item.xml
index 569da71..cca2efd 100644
--- a/res/layout/color_picker_pref_item.xml
+++ b/res/layout/color_picker_pref_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/layout/picture_item.xml b/res/layout/picture_item.xml
index dc33d6c..54f5409 100644
--- a/res/layout/picture_item.xml
+++ b/res/layout/picture_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,17 +14,24 @@
      See the License for the specific language governing permissions and
      limitations under the License.
  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/picture"
-    android:layout_width="@dimen/picture_size"
-    android:layout_height="@dimen/picture_size"
-    style="@style/PhotoPhase.Album.Picture">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
-    <ImageView android:id="@+id/picture_thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:background="@color/album_thumbnail_color"
-        android:contentDescription="@null" />
+    <org.cyanogenmod.wallpapers.photophase.widgets.PictureItemView
+        android:id="@+id/picture"
+        android:layout_width="@dimen/picture_size"
+        android:layout_height="@dimen/picture_size"
+        style="@style/PhotoPhase.Album.Picture">
+
+        <ImageView android:id="@+id/picture_thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:background="@color/album_thumbnail_color"
+            android:contentDescription="@null" />
+
+    </org.cyanogenmod.wallpapers.photophase.widgets.PictureItemView>
 
 </FrameLayout>
diff --git a/res/layout/album.xml b/res/layout/pictures_view.xml
index 63aa9ad..141fde6 100644
--- a/res/layout/album.xml
+++ b/res/layout/pictures_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,19 +14,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/album_pictures_view"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/small_margin">
-
-    <include android:id="@+id/album_info"
-        layout="@layout/album_info"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true" />
-
-    <include android:id="@+id/album_pictures"
-        layout="@layout/album_pictures"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true" />
-
-</RelativeLayout>
+    android:layout_height="match_parent"
+    android:persistentDrawingCache="animation|scrolling"
+    android:listSelector="@android:color/transparent"
+    android:divider="@android:color/transparent"
+    android:dividerHeight="@dimen/one_dp"
+    android:scrollbars="none"
+    android:layoutAnimation="@anim/pictures_layout_animation">
+</GridView>
diff --git a/res/layout/preference_widget_seekbar.xml b/res/layout/preference_widget_seekbar.xml
index 6aa0840..d1fdb1b 100644
--- a/res/layout/preference_widget_seekbar.xml
+++ b/res/layout/preference_widget_seekbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The Android Open Source Project
      Copyright (C) 2013 The CyanogenMod Project
 
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:minWidth="48dp"
-            />
+            android:contentDescription="@null"/>
     </LinearLayout>
 
     <RelativeLayout
diff --git a/res/layout/preference_widget_seekbar_progress.xml b/res/layout/preference_widget_seekbar_progress.xml
index 531373b..d0035c1 100644
--- a/res/layout/preference_widget_seekbar_progress.xml
+++ b/res/layout/preference_widget_seekbar_progress.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The Android Open Source Project
      Copyright (C) 2013 The CyanogenMod Project
 
diff --git a/res/menu/album_actions.xml b/res/menu/album_actions.xml
index 2785178..004f3db 100644
--- a/res/menu/album_actions.xml
+++ b/res/menu/album_actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,4 +21,10 @@
     <item android:id="@+id/mnu_deselect_album"
         android:title="@string/mnu_deselect_album"
         android:showAsAction="never" />
+    <item android:id="@+id/mnu_select_all"
+        android:title="@string/mnu_select_all"
+        android:showAsAction="never" />
+    <item android:id="@+id/mnu_deselect_all"
+        android:title="@string/mnu_deselect_all"
+        android:showAsAction="never" />
 </menu>
diff --git a/res/menu/albums.xml b/res/menu/albums.xml
index b5f3af6..1f979d9 100644
--- a/res/menu/albums.xml
+++ b/res/menu/albums.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
      limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/mnu_invert_all"
-        android:title="@string/mnu_invert_all"
+	<item android:id="@+id/mnu_invert"
+        android:title="@string/mnu_invert"
         android:icon="@drawable/ic_invert"
         android:showAsAction="ifRoom|withText" />
     <item android:id="@+id/mnu_restore"
diff --git a/res/menu/dispositions.xml b/res/menu/dispositions.xml
index 8fd7a27..0047a6b 100644
--- a/res/menu/dispositions.xml
+++ b/res/menu/dispositions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/menu/main.xml b/res/menu/main.xml
index fbc301a..71dd90b 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
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;
-}
diff --git a/res/values-es/plurals.xml b/res/values-es/plurals.xml
index 9865d84..448f035 100644
--- a/res/values-es/plurals.xml
+++ b/res/values-es/plurals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4687af0..f6bb32d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,8 +24,7 @@
     <string name="mnu_settings">Ajustes</string>
     <string name="mnu_select_all">Seleccionar todo</string>
     <string name="mnu_deselect_all">Deseleccionar todo</string>
-    <string name="mnu_invert_all">Invertir todo</string>
-    <string name="mnu_invert_selection">Invertir selección</string>
+    <string name="mnu_invert">Invertir</string>
     <string name="mnu_select_album">Seleccionar álbum</string>
     <string name="mnu_deselect_album">Deseleccionar álbum</string>
     <string name="pref_general">General</string>
@@ -75,7 +74,6 @@
     <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>
     <string name="refresh_intervals_disabled">Deshabilitado</string>
     <string name="refresh_intervals_1h">1 hora</string>
-    <string name="refresh_intervals_2h">2 horas</string>
     <string name="refresh_intervals_4h">4 horas</string>
     <string name="refresh_intervals_1d">1 día</string>
     <string name="refresh_intervals_2d">2 días</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 1fc1048..7995c82 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index e03dcfb..4eff78c 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/drawable/frame.xml b/res/values-sw600dp-port/dimens.xml
index a3fecaf..dc99052 100644
--- a/res/drawable/frame.xml
+++ b/res/values-sw600dp-port/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-     android:shape="rectangle">
-     <stroke android:width="1dp" android:color="#000" />
-     <solid android:color="@android:color/darker_gray"/>
-</shape>
-
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <dimen name="picture_size">96dp</dimen>
+</resources>
diff --git a/res/menu/pictures_actions.xml b/res/values-sw600dp/dimens.xml
index bfb95e2..dc99052 100644
--- a/res/menu/pictures_actions.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,14 +14,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/mnu_select_all"
-        android:title="@string/mnu_select_all"
-        android:showAsAction="never" />
-    <item android:id="@+id/mnu_deselect_all"
-        android:title="@string/mnu_deselect_all"
-        android:showAsAction="never" />
-    <item android:id="@+id/mnu_invert_selection"
-        android:title="@string/mnu_invert_selection"
-        android:showAsAction="never" />
-</menu>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <dimen name="picture_size">96dp</dimen>
+</resources>
diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml
new file mode 100644
index 0000000..71a0db2
--- /dev/null
+++ b/res/values-sw720dp-port/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <dimen name="picture_size">100dp</dimen>
+</resources>
diff --git a/res/values-sw720dp-w1280dp/dimens.xml b/res/values-sw720dp-w1280dp/dimens.xml
index 19adc8d..e2c9cc9 100644
--- a/res/values-sw720dp-w1280dp/dimens.xml
+++ b/res/values-sw720dp-w1280dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 3092324..6651de4 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,5 +15,6 @@
      limitations under the License.
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <dimen name="picture_size">116dp</dimen>
     <dimen name="preference_icon_minWidth">56dp</dimen>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 192fa65..3ab44b2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e8cc096..9f80bce 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
     <color name="wallpaper_background_color">#ff202020</color>
     <color name="wallpaper_overlay_color">#aa202020</color>
 
-    <color name="album_thumbnail_color">#aa202020</color>
+    <color name="album_thumbnail_color">#aa606060</color>
 
     <color name="text_color">#404040</color>
     <color name="notification_text_color">#ffffffff</color>
diff --git a/res/values/config.xml b/res/values/config.xml
index 1a3b9c9..dc7c0f9 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ff148dc..1c6e518 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,12 +27,11 @@
     <dimen name="album_margin">16dp</dimen>
     <dimen name="album_info_margin">2dp</dimen>
 
-    <dimen name="album_title_height">20dp</dimen>
     <dimen name="album_title_margin_top">38dp</dimen>
     <dimen name="album_title_margin_left">-38dp</dimen>
 
     <dimen name="picture_size">80dp</dimen>
-    <dimen name="picture_vertical_margin">8dp</dimen>
+    <dimen name="picture_vertical_margin">4dp</dimen>
     <dimen name="picture_horizontal_margin">4dp</dimen>
 
     <dimen name="notification_min_width">32dp</dimen>
@@ -44,11 +43,11 @@
     <dimen name="default_margin">16dp</dimen>
     <dimen name="small_margin">8dp</dimen>
     <dimen name="small_padding">5dp</dimen>
+    <dimen name="one_dp">1dp</dimen>
 
     <dimen name="disposition_frame_margin">12dp</dimen>
     <dimen name="disposition_frame_padding">1dp</dimen>
     <dimen name="disposition_advise_frame_padding">4dp</dimen>
-    <dimen name="resize_frame_padding">12dp</dimen>
     <dimen name="resize_frame_extra_handling_space">16dp</dimen>
 
 </resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index fc94b4d..64f948c 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,10 @@
      limitations under the License.
  -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <integer name="cards_slide_anim">1000</integer>
+    <integer name="cards_slide_up_anim">600</integer>
+    <integer name="cards_rotate_anim">800</integer>
+    <integer name="pictures_anim_in">600</integer>
+    <integer name="pictures_anim_out">400</integer>
     <integer name="disposition_show_anim">600</integer>
     <integer name="disposition_hide_anim">400</integer>
 </resources>
diff --git a/res/values/plurals.xml b/res/values/plurals.xml
index 6e850be..b828ec7 100644
--- a/res/values/plurals.xml
+++ b/res/values/plurals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b35a1a9..7ec74dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,8 +33,7 @@
     <string name="mnu_settings">Settings</string>
     <string name="mnu_select_all">Select all</string>
     <string name="mnu_deselect_all">Deselect all</string>
-    <string name="mnu_invert_all">Invert all</string>
-    <string name="mnu_invert_selection">Invert selection</string>
+    <string name="mnu_invert">Invert</string>
     <string name="mnu_select_album">Select album</string>
     <string name="mnu_deselect_album">Deselect album</string>
 
@@ -92,7 +91,6 @@
     <!-- Refresh intervals -->
     <string name="refresh_intervals_disabled">Disabled</string>
     <string name="refresh_intervals_1h">1 hour</string>
-    <string name="refresh_intervals_2h">2 hours</string>
     <string name="refresh_intervals_4h">4 hours</string>
     <string name="refresh_intervals_1d">1 day</string>
     <string name="refresh_intervals_2d">2 days</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6a37f3f..894e9e5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 37eb08d..7e2e4b3 100644
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/xml/preferences_headers.xml b/res/xml/preferences_headers.xml
index 856fe6c..15cd61f 100644
--- a/res/xml/preferences_headers.xml
+++ b/res/xml/preferences_headers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/xml/preferences_layout.xml b/res/xml/preferences_layout.xml
index 8ef4e8f..02d12e3 100644
--- a/res/xml/preferences_layout.xml
+++ b/res/xml/preferences_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/xml/preferences_media.xml b/res/xml/preferences_media.xml
index 6d1badc..4325c3c 100644
--- a/res/xml/preferences_media.xml
+++ b/res/xml/preferences_media.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/xml/wallpaper.xml b/res/xml/wallpaper.xml
index 068925e..45ad9a1 100644
--- a/res/xml/wallpaper.xml
+++ b/res/xml/wallpaper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
      Copyright (C) 2013 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");