diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2014-06-26 01:59:52 +0200 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2014-06-26 01:59:52 +0200 |
commit | e05316530310250908134aa85b9a5057cacd9543 (patch) | |
tree | 40ac9d083a9e6cac354080c5e6e965f0b1ecda14 | |
parent | 7dc62e48c41943003e8ec5659c9f48fca318df2c (diff) | |
download | android_packages_wallpapers_PhotoPhase-e05316530310250908134aa85b9a5057cacd9543.tar.gz android_packages_wallpapers_PhotoPhase-e05316530310250908134aa85b9a5057cacd9543.tar.bz2 android_packages_wallpapers_PhotoPhase-e05316530310250908134aa85b9a5057cacd9543.zip |
photophase: adjust number of lines for disposition summary view
Change-Id: Ie8fdef1b75b42063e451488c90b1b9bba25de2d6
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r-- | res/layout/choose_disposition_fragment.xml | 1 | ||||
-rw-r--r-- | res/values/integers.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java | 5 |
4 files changed, 6 insertions, 3 deletions
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml index 9cb3a36..e0bd25b 100644 --- a/res/layout/choose_disposition_fragment.xml +++ b/res/layout/choose_disposition_fragment.xml @@ -28,7 +28,6 @@ android:layout_marginRight="@dimen/disposition_frame_margin" android:padding="@dimen/disposition_advise_frame_padding" 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" /> diff --git a/res/values/integers.xml b/res/values/integers.xml index 879c3e6..b632fcd 100644 --- a/res/values/integers.xml +++ b/res/values/integers.xml @@ -21,5 +21,4 @@ <integer name="pictures_anim_out">400</integer> <integer name="disposition_show_anim">800</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 8f9b42a..37b8ff8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -92,7 +92,7 @@ <string name="pref_disposition_landscape">Landscape arrangement</string> <string name="pref_disposition_landscape_summary">Select how pictures are arranged on a landscape screen</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_description">Long tap a frame and drag \u0026 drop its borders. Swipe 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> diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java index fab3f6b..4c663ab 100644 --- a/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java +++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/DispositionFragment.java @@ -52,6 +52,7 @@ public abstract class DispositionFragment extends PreferenceFragment private DispositionAdapter mAdapter; private ResizeFrame mResizeFrame; private TextView mAdvise; + private int mAdviseLines = -1; private DispositionView mCurrentDispositionView; private int mCurrentPage; @@ -315,6 +316,10 @@ public abstract class DispositionFragment extends PreferenceFragment if (position == 0) { mAdvise.setText(getString(R.string.pref_disposition_description)); } else { + if (mAdviseLines == -1) { + mAdviseLines = mAdvise.getLineCount(); + mAdvise.setLines(mAdviseLines); + } mAdvise.setText(getString(R.string.pref_disposition_template, String.valueOf(position), String.valueOf(mNumberOfTemplates))); } |