diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2013-11-03 20:26:05 +0100 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2013-11-03 20:26:05 +0100 |
commit | cf54b6212fdfd3bc0a0a1cab3b2d8415e07b382b (patch) | |
tree | a540738842d0982eb97576800ecd8ed5d696f1c3 /res | |
parent | 2d6d5b71345b21eba2a3265c501499e466653dc5 (diff) | |
download | android_packages_wallpapers_PhotoPhase-cf54b6212fdfd3bc0a0a1cab3b2d8415e07b382b.tar.gz android_packages_wallpapers_PhotoPhase-cf54b6212fdfd3bc0a0a1cab3b2d8415e07b382b.tar.bz2 android_packages_wallpapers_PhotoPhase-cf54b6212fdfd3bc0a0a1cab3b2d8415e07b382b.zip |
Move mColorPicker code to src folder
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/choose_disposition_fragment.xml | 19 | ||||
-rw-r--r-- | res/values-es/strings.xml | 3 | ||||
-rw-r--r-- | res/values/colors.xml | 1 | ||||
-rw-r--r-- | res/values/integers.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 4 |
5 files changed, 17 insertions, 11 deletions
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml index a72f148..c42ae7d 100644 --- a/res/layout/choose_disposition_fragment.xml +++ b/res/layout/choose_disposition_fragment.xml @@ -27,28 +27,29 @@ android:layout_marginLeft="@dimen/disposition_frame_margin" android:layout_marginRight="@dimen/disposition_frame_margin" android:padding="@dimen/disposition_advise_frame_padding" - android:gravity="center_horizontal" + android:gravity="center" + android:lines="@integer/disposition_advise_lines" android:textColor="@color/notification_text_color" android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/pref_disposition_description" /> - <org.cyanogenmod.wallpapers.photophase.widgets.DispositionView - android:id="@+id/disposition_view" + <android.support.v4.view.ViewPager + android:id="@+id/dispositions_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/disposition_frame_margin" android:layout_below="@id/advise" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" /> + android:layout_alignParentBottom="true"> + </android.support.v4.view.ViewPager> <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignLeft="@id/disposition_view" - android:layout_alignRight="@id/disposition_view" - android:layout_alignTop="@id/disposition_view" - android:layout_alignBottom="@id/disposition_view"> + android:layout_alignLeft="@id/dispositions_pager" + android:layout_alignRight="@id/dispositions_pager" + android:layout_alignTop="@id/dispositions_pager" + android:layout_alignBottom="@id/dispositions_pager"> <org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame android:id="@+id/resize_frame" android:layout_width="1dp" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 41d1358..9a5b2eb 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -75,7 +75,8 @@ <string name="pref_disposition_portrait_summary">Selecciona como se mostraran las imágenes en una pantalla horizontal</string> <string name="pref_disposition_landscape">Disposición horizontal</string> <string name="pref_disposition_landscape_summary">Selecciona como se mostraran las imágenes en una pantalla vertical</string> - <string name="pref_disposition_description">Presiona una celda durante un segundo para seleccionarla. Entonces arrastra y suelta los bordes de la celda para redimensionarla</string> + <string name="pref_disposition_description">Presiona una celda y arrastre sus bordes. Deslize a izquierda y derecha para ver plantillas predefinidas</string> + <string name="pref_disposition_template">Plantilla <xliff:g id="number_of_template">%1$s</xliff:g> de <xliff:g id="total_of_templates">%2$s</xliff:g></string> <string name="pref_disposition_unable_delete_advise">No es posible borrar la celda seleccionada</string> <string name="pref_about">Acerca de</string> <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string> diff --git a/res/values/colors.xml b/res/values/colors.xml index 9f80bce..d53ecd3 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -25,5 +25,6 @@ <color name="notification_text_color">#ffffffff</color> <color name="disposition_frame_bg_color">#c8595757</color> + <color name="disposition_locked_frame_bg_color">#c87f4a4a</color> </resources> diff --git a/res/values/integers.xml b/res/values/integers.xml index 64f948c..25e3088 100644 --- a/res/values/integers.xml +++ b/res/values/integers.xml @@ -21,4 +21,5 @@ <integer name="pictures_anim_out">400</integer> <integer name="disposition_show_anim">600</integer> <integer name="disposition_hide_anim">400</integer> + <integer name="disposition_advise_lines">2</integer> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index e0359ae..a99e7a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -91,7 +91,9 @@ <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">Long tap a frame to select it. Then drag \u0026 drop the borders of the frame to resize it</string> + <!-- [2 lines one for describe long tap and another for describe swipe] --> + <string name="pref_disposition_description">Long tap a frame and drag \u0026 drop its borders.\nSwipe left and right to show defined templates</string> + <string name="pref_disposition_template">Template <xliff:g id="number_of_template">%1$s</xliff:g> of <xliff:g id="total_of_templates">%2$s</xliff:g></string> <string name="pref_disposition_unable_delete_advise">Unable to delete the selected frame</string> <string name="pref_about">About</string> |