Initial steps of the disposition preference.

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

23 files changed, 28 insertions, 5 deletions

diff --git a/res/drawable-hdpi/ic_camera.png b/res/drawable-hdpi/ic_camera.png
new file mode 100644
index 0000000..e0157f7
--- /dev/null
+++ b/res/drawable-hdpi/ic_camera.png
diff --git a/res/drawable-hdpi/resize_frame_holo.9.png b/res/drawable-hdpi/resize_frame_holo.9.png
new file mode 100644
index 0000000..059a9d6
--- /dev/null
+++ b/res/drawable-hdpi/resize_frame_holo.9.png
diff --git a/res/drawable-hdpi/resize_handle_bottom.png b/res/drawable-hdpi/resize_handle_bottom.png
new file mode 100644
index 0000000..bc4418f
--- /dev/null
+++ b/res/drawable-hdpi/resize_handle_bottom.png
diff --git a/res/drawable-hdpi/resize_handle_left.png b/res/drawable-hdpi/resize_handle_left.png
new file mode 100644
index 0000000..b808170
--- /dev/null
+++ b/res/drawable-hdpi/resize_handle_left.png
diff --git a/res/drawable-hdpi/resize_handle_right.png b/res/drawable-hdpi/resize_handle_right.png
new file mode 100644
index 0000000..bcb8104
--- /dev/null
+++ b/res/drawable-hdpi/resize_handle_right.png
diff --git a/res/drawable-hdpi/resize_handle_top.png b/res/drawable-hdpi/resize_handle_top.png
new file mode 100644
index 0000000..3ec18de
--- /dev/null
+++ b/res/drawable-hdpi/resize_handle_top.png
diff --git a/res/drawable-mdpi/ic_camera.png b/res/drawable-mdpi/ic_camera.png
new file mode 100644
index 0000000..17a2e9d
--- /dev/null
+++ b/res/drawable-mdpi/ic_camera.png
diff --git a/res/drawable-mdpi/resize_frame_holo.9.png b/res/drawable-mdpi/resize_frame_holo.9.png
new file mode 100644
index 0000000..435f3aa
--- /dev/null
+++ b/res/drawable-mdpi/resize_frame_holo.9.png
diff --git a/res/drawable-mdpi/resize_handle_bottom.png b/res/drawable-mdpi/resize_handle_bottom.png
new file mode 100644
index 0000000..848af0a
--- /dev/null
+++ b/res/drawable-mdpi/resize_handle_bottom.png
diff --git a/res/drawable-mdpi/resize_handle_left.png b/res/drawable-mdpi/resize_handle_left.png
new file mode 100644
index 0000000..0e62c9c
--- /dev/null
+++ b/res/drawable-mdpi/resize_handle_left.png
diff --git a/res/drawable-mdpi/resize_handle_right.png b/res/drawable-mdpi/resize_handle_right.png
new file mode 100644
index 0000000..5c8d477
--- /dev/null
+++ b/res/drawable-mdpi/resize_handle_right.png
diff --git a/res/drawable-mdpi/resize_handle_top.png b/res/drawable-mdpi/resize_handle_top.png
new file mode 100644
index 0000000..609e06b
--- /dev/null
+++ b/res/drawable-mdpi/resize_handle_top.png
diff --git a/res/drawable-xhdpi/ic_camera.png b/res/drawable-xhdpi/ic_camera.png
new file mode 100644
index 0000000..8a9b3a3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_camera.png
diff --git a/res/drawable-xhdpi/resize_frame_holo.9.png b/res/drawable-xhdpi/resize_frame_holo.9.png
new file mode 100644
index 0000000..270c9b7
--- /dev/null
+++ b/res/drawable-xhdpi/resize_frame_holo.9.png
diff --git a/res/drawable-xhdpi/resize_handle_bottom.png b/res/drawable-xhdpi/resize_handle_bottom.png
new file mode 100644
index 0000000..d4b11c9
--- /dev/null
+++ b/res/drawable-xhdpi/resize_handle_bottom.png
diff --git a/res/drawable-xhdpi/resize_handle_left.png b/res/drawable-xhdpi/resize_handle_left.png
new file mode 100644
index 0000000..6eb7cd0
--- /dev/null
+++ b/res/drawable-xhdpi/resize_handle_left.png
diff --git a/res/drawable-xhdpi/resize_handle_right.png b/res/drawable-xhdpi/resize_handle_right.png
new file mode 100644
index 0000000..01d96ab
--- /dev/null
+++ b/res/drawable-xhdpi/resize_handle_right.png
diff --git a/res/drawable-xhdpi/resize_handle_top.png b/res/drawable-xhdpi/resize_handle_top.png
new file mode 100644
index 0000000..9066218
--- /dev/null
+++ b/res/drawable-xhdpi/resize_handle_top.png
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml
index becf879..166f715 100644
--- a/res/layout/choose_disposition_fragment.xml
+++ b/res/layout/choose_disposition_fragment.xml
@@ -14,11 +14,29 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/default_margin"
-    android:layout_marginBottom="@dimen/default_margin">
+    android:layout_marginBottom="@dimen/default_margin"
+    android:orientation="vertical">
 
-    <!-- Resize widgets are inserted here -->
-</RelativeLayout>
+    <TextView android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/holo_blue_light"
+        android:layout_marginEnd="8dip"
+        android:layout_marginStart="8dip"
+        android:padding="4dip"
+        android:gravity="center_horizontal"
+        android:textColor="#FFFFFF"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/pref_disposition_description" />
+
+    <org.cyanogenmod.wallpapers.photophase.widgets.DispositionView
+        android:id="@+id/disposition_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/default_margin"
+        android:layout_marginBottom="@dimen/default_margin" />
+</LinearLayout>
diff --git a/res/menu/choose_preference.xml b/res/menu/accept_restore_preference.xml
index 435e4da..435e4da 100644
--- a/res/menu/choose_preference.xml
+++ b/res/menu/accept_restore_preference.xml
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d22597f..a944c45 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,4 +24,6 @@
     <color name="text_color">#404040</color>
     <color name="notification_text_color">#ffffffff</color>
 
+    <color name="disposition_frame_bg_color">#c8595757</color>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7721a7b..3fc07e1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -44,4 +44,6 @@
     <dimen name="default_margin">16dp</dimen>
     <dimen name="small_margin">8dp</dimen>
     <dimen name="small_padding">5dp</dimen>
+
+    <dimen name="disposition_frame_padding">1dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4aa51d4..eec1105 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -72,13 +72,14 @@
     <string name="pref_disposition_portrait_summary">Select how pictures are disposed on a portrait screen</string>
     <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">Tap a frame to select it. Then drag \u0026 drop the borders of the frame to resize it.
+        Tap the split buttons to split the frame horizontally or vertically.</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>
 
     <!-- Plurals -->
     <plurals name="album_number_of_pictures">
-        <item quantity="zero">0 pictures</item>
         <item quantity="one">1 picture</item>
         <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> pictures</item>
     </plurals>