Disposition Preference Layout (#1)

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

8 files changed, 69 insertions, 1 deletions

diff --git a/res/anim/display_with_bounce.xml b/res/anim/display_with_bounce.xml
new file mode 100644
index 0000000..b9ea8c2
--- /dev/null
+++ b/res/anim/display_with_bounce.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source 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.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:anim/bounce_interpolator" >
+
+    <scale
+        android:duration="@integer/disposition_show_anim"
+        android:fromXScale="0.0"
+        android:fromYScale="0.0"
+        android:toXScale="1.0"
+        android:toYScale="1.0"
+        android:pivotX="50%"
+        android:pivotY="50%" />
+    
+    <alpha
+        android:duration="@integer/disposition_show_anim"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+
+</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_delete.png b/res/drawable-hdpi/ic_delete.png
new file mode 100644
index 0000000..e9ce89e
--- /dev/null
+++ b/res/drawable-hdpi/ic_delete.png
diff --git a/res/drawable-mdpi/ic_delete.png b/res/drawable-mdpi/ic_delete.png
new file mode 100644
index 0000000..cedb108
--- /dev/null
+++ b/res/drawable-mdpi/ic_delete.png
diff --git a/res/drawable-xhdpi/ic_delete.png b/res/drawable-xhdpi/ic_delete.png
new file mode 100644
index 0000000..98c73da
--- /dev/null
+++ b/res/drawable-xhdpi/ic_delete.png
diff --git a/res/menu/accept_restore_preference.xml b/res/menu/albums.xml
index 435e4da..ec699a3 100644
--- a/res/menu/accept_restore_preference.xml
+++ b/res/menu/albums.xml
@@ -18,7 +18,7 @@
     <item android:id="@+id/mnu_restore"
         android:title="@string/mnu_restore"
         android:icon="@drawable/ic_restore"
-        android:showAsAction="always|withText" />
+        android:showAsAction="ifRoom|withText" />
     <item android:id="@+id/mnu_ok"
         android:title="@string/mnu_ok"
         android:icon="@drawable/ic_accept"
diff --git a/res/menu/dispositions.xml b/res/menu/dispositions.xml
new file mode 100644
index 0000000..e167992
--- /dev/null
+++ b/res/menu/dispositions.xml
@@ -0,0 +1,30 @@
+<?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.
+ -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/mnu_delete"
+        android:title="@string/mnu_delete"
+        android:icon="@drawable/ic_delete"
+        android:showAsAction="ifRoom|withText" />
+    <item android:id="@+id/mnu_restore"
+        android:title="@string/mnu_restore"
+        android:icon="@drawable/ic_restore"
+        android:showAsAction="ifRoom|withText" />
+    <item android:id="@+id/mnu_ok"
+        android:title="@string/mnu_ok"
+        android:icon="@drawable/ic_accept"
+        android:showAsAction="always|withText" />
+</menu>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 09ee5c2..6e5eb23 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -16,4 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <integer name="cards_slide_anim">800</integer>
+    <integer name="disposition_show_anim">600</integer>
+    <integer name="disposition_hide_anim">400</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93b8824..0e4d33d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,7 @@
     <!-- Menus -->
     <string name="mnu_ok" translatable="false">@android:string/ok</string>
     <string name="mnu_restore">Restore</string>
+    <string name="mnu_delete">Delete</string>
     <string name="mnu_settings">Settings</string>
     <string name="mnu_select_all">Select all</string>
     <string name="mnu_deselect_all">Deselect all</string>
@@ -73,6 +74,7 @@
     <string name="pref_disposition_landscape">Landscape disposition</string>
     <string name="pref_disposition_landscape_summary">Select how pictures are disposed on a landscape screen</string>
     <string name="pref_disposition_description">Long tap a frame to select it. Then drag \u0026 drop the borders of the frame to resize it.</string>
+    <string name="pref_disposition_unable_delete_advise">Unable to delete the selected frame</string>
 
     <string name="pref_about">About</string>
     <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>