From 79acc329b7bef53c85e01f969a885fd93e1f590c Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 4 Sep 2012 10:55:14 -0700 Subject: [PATCH] Layout adjustments to work with new arrow images --- astrid/res/drawable-hdpi/popover_bg.9.png | Bin 0 -> 1868 bytes astrid/res/drawable-xhdpi/popover_bg.9.png | Bin 0 -> 1868 bytes astrid/res/layout-xlarge/help_popover.xml | 41 ++++++++++++++++++ astrid/res/layout/help_popover.xml | 4 +- astrid/res/values/strings-intro.xml | 4 +- .../astrid/welcome/HelpInfoPopover.java | 6 +++ 6 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 astrid/res/drawable-hdpi/popover_bg.9.png create mode 100644 astrid/res/drawable-xhdpi/popover_bg.9.png create mode 100644 astrid/res/layout-xlarge/help_popover.xml diff --git a/astrid/res/drawable-hdpi/popover_bg.9.png b/astrid/res/drawable-hdpi/popover_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..2d0dc7b9d5069f46212b7495c5b59524ac847a2c GIT binary patch literal 1868 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 + + + + + + + + + + diff --git a/astrid/res/layout/help_popover.xml b/astrid/res/layout/help_popover.xml index d78f8e1fc..3ac5fa708 100644 --- a/astrid/res/layout/help_popover.xml +++ b/astrid/res/layout/help_popover.xml @@ -23,7 +23,7 @@ diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml index 0df2e88e5..18be4af58 100644 --- a/astrid/res/values/strings-intro.xml +++ b/astrid/res/values/strings-intro.xml @@ -19,10 +19,10 @@ Tap to edit or share this list - People you share with can help you build your list or finish tasks + People you share with can help\nyou build your list or finish tasks - Tap add a list + Tap to add a list Tap to add a list or switch between lists diff --git a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java b/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java index bdcb93818..d873e595a 100644 --- a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java +++ b/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java @@ -19,6 +19,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.timsu.astrid.R; +import com.todoroo.astrid.utility.AstridPreferences; /** * Displays a popover with some help text for first time users. @@ -47,6 +48,8 @@ public class HelpInfoPopover extends QuickActionWidget { return toShow; } + private final boolean tablet; + private HelpInfoPopover(Context context, int textId) { super(context); setContentView(R.layout.help_popover); @@ -54,6 +57,7 @@ public class HelpInfoPopover extends QuickActionWidget { message.setText(textId); setFocusable(false); setTouchable(true); + tablet = AstridPreferences.useTabletLayout(context); } @Override @@ -63,6 +67,8 @@ public class HelpInfoPopover extends QuickActionWidget { @Override protected int getArrowLeftMargin(View arrow) { + if (tablet) + return mRect.width() / 4; return mRect.width() / 2; }