From 1d18eb50cb8cb45b640ef472e2b3b4d06ff1ee6e Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 22 Aug 2013 10:07:32 -0500 Subject: [PATCH] Remove help info popovers --- .../astrid/actfm/TagSettingsActivity.java | 11 -- .../todoroo/astrid/actfm/TagViewFragment.java | 16 --- .../res/drawable-hdpi/popover_arrow_down.png | Bin 2507 -> 0 bytes astrid/res/drawable-hdpi/popover_arrow_up.png | Bin 1174 -> 0 bytes astrid/res/drawable-hdpi/popover_bg.9.png | Bin 1868 -> 0 bytes .../res/drawable-xhdpi/popover_arrow_down.png | Bin 1890 -> 0 bytes .../res/drawable-xhdpi/popover_arrow_up.png | Bin 1334 -> 0 bytes astrid/res/drawable-xhdpi/popover_bg.9.png | Bin 1868 -> 0 bytes astrid/res/drawable/popover_arrow_down.png | Bin 1446 -> 0 bytes astrid/res/drawable/popover_arrow_up.png | Bin 1160 -> 0 bytes astrid/res/drawable/popover_bg.9.png | Bin 1868 -> 0 bytes astrid/res/layout-xlarge/help_popover.xml | 41 ------- astrid/res/layout/help_popover.xml | 41 ------- astrid/res/values/keys.xml | 11 -- .../astrid/activity/FilterListFragment.java | 6 - .../astrid/activity/TaskEditFragment.java | 10 -- .../astrid/activity/TaskListFragment.java | 93 --------------- .../com/todoroo/astrid/ui/QuickAddBar.java | 1 - .../astrid/welcome/HelpInfoPopover.java | 108 ------------------ 19 files changed, 338 deletions(-) delete mode 100644 astrid/res/drawable-hdpi/popover_arrow_down.png delete mode 100644 astrid/res/drawable-hdpi/popover_arrow_up.png delete mode 100644 astrid/res/drawable-hdpi/popover_bg.9.png delete mode 100644 astrid/res/drawable-xhdpi/popover_arrow_down.png delete mode 100644 astrid/res/drawable-xhdpi/popover_arrow_up.png delete mode 100644 astrid/res/drawable-xhdpi/popover_bg.9.png delete mode 100644 astrid/res/drawable/popover_arrow_down.png delete mode 100644 astrid/res/drawable/popover_arrow_up.png delete mode 100644 astrid/res/drawable/popover_bg.9.png delete mode 100644 astrid/res/layout-xlarge/help_popover.xml delete mode 100644 astrid/res/layout/help_popover.xml delete mode 100644 astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 84b6746b8..637761236 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -69,7 +69,6 @@ import com.todoroo.astrid.ui.PeopleContainer; import com.todoroo.astrid.ui.PeopleContainer.ParseSharedException; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.ResourceDrawableCache; -import com.todoroo.astrid.welcome.HelpInfoPopover; import edu.mit.mobile.android.imagecache.ImageCache; @@ -173,8 +172,6 @@ public class TagSettingsActivity extends SherlockFragmentActivity { } }).start(); } - showCollaboratorsPopover(); - } private void setupForDialogOrFullscreen() { @@ -199,14 +196,6 @@ public class TagSettingsActivity extends SherlockFragmentActivity { } } - private void showCollaboratorsPopover() { - if (!Preferences.getBoolean(R.string.p_showed_collaborators_help, false)) { - View members = findViewById(R.id.members_container); - HelpInfoPopover.showPopover(this, members, R.string.help_popover_collaborators, null); - Preferences.setBoolean(R.string.p_showed_collaborators_help, true); - } - } - protected void setUpSettingsPage() { if (isDialog) { findViewById(R.id.save_and_cancel).setVisibility(View.VISIBLE); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 591c684c2..ed4c1729b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -88,7 +88,6 @@ import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.utility.ResourceDrawableCache; -import com.todoroo.astrid.welcome.HelpInfoPopover; public class TagViewFragment extends TaskListFragment { @@ -203,20 +202,6 @@ public class TagViewFragment extends TaskListFragment { return R.layout.task_list_body_tag; } - private void showListSettingsPopover() { - if (!AstridPreferences.canShowPopover()) { - return; - } - if (!Preferences.getBoolean(R.string.p_showed_list_settings_help, false)) { - Preferences.setBoolean(R.string.p_showed_list_settings_help, true); - View tabView = getView().findViewById(R.id.members_edit); - if (tabView != null) { - HelpInfoPopover.showPopover(getActivity(), tabView, - R.string.help_popover_list_settings, null); - } - } - } - @Override protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) { if(actFmPreferenceService.isLoggedIn()) { @@ -751,7 +736,6 @@ public class TagViewFragment extends TaskListFragment { IntentFilter intentFilter = new IntentFilter(BROADCAST_TAG_ACTIVITY); getActivity().registerReceiver(notifyReceiver, intentFilter); - showListSettingsPopover(); updateCommentCount(); } diff --git a/astrid/res/drawable-hdpi/popover_arrow_down.png b/astrid/res/drawable-hdpi/popover_arrow_down.png deleted file mode 100644 index 3f1f6ca7f20725fbe11d78111b31b48e36cc00fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2507 zcmV;+2{iVJP)q=3Gw58CdTC=@qM6(Ku?7GG_?PlAgrfH&46e;k-KmB35jkuSHt3>4zZLM+F zNL(axkzHMw*|7`C%@t>KV8C&h+t>F!{SG;dGiS~j28zjk`i3*NGvD`|=Xu`u{myWd zQu6HxK2+aAAU!m4-qiVxBk$|c$qb!}du|u%@=@~L#HhZU#ro?Gw~zd**G?wAloY;{ zKw`D3nE`a{mi13HU6##p(VFKLpb4jk{CZ7FQ_kY_>kl1nvh7?ic{g_v4^Y?)0?-MP z2L4+K#}R=*S~!SSb3{Fl8HLX3fdx1{KH|j(Fn@j>Fw)|68}qR0^O! zLX6`12#*D!B3i}(5Kjxz<6g$cdPc=TyNj3}Imv{}$G>^L!9>}GO^wx(%#;{nh*1-i z6uf1(`E~RcN(Z@9f#LhX)9sTnll9Au4NFpL)rAT^3Srw(-aF0VE&e zenz5>yuE56+41T^qEVKouS2|smetqSM^>y@F~yp8h+jZFl6$6PpzUv0CzGu&8OS2N znx{3L2eLwNkU7OGlazvULjZ@be^jbx>Y&dcekHs?&PdT~$UE67Wb=!OaIEI9ApJiv zhhwtZ3Ct;a*+8Pyiul|dZ0#y36y=PCz@&GwFhR~!gWMt@t9C|+CrVq57UoIg^HpvUkQEZ)m!a0E3W4s=lz=o>a*Keh+L%hL zGi_F7pGZn>^GsG95F0{W_@tyH*}a%R#ZMvPmB@|4zorNllj0&UOj)%tL$*u3sivle zT)K3L2$i(llYbxL6Q#xE-=UanfMW6y9CI@ODFQ`c7sOAbnA6_gPPT8~PVU{iH}#w( zKob)aq_MG)2t8UtLc$L=ZQ67ml_Ymo7KaBaZY#7UP;ooL1Br?Z8D&-UiZbSOc6N4| zOr{^R@`a0yjip<*Y?-dRjt;VZ{d!`zPbZfoK&;%x>!gLi?#@+QT>R7H$B)Jc(4jBN%F24-a0#;qFXDk~0Z@EXSD)j;uYxY!eP29VA zegAWYnaBzxWvZ^O?q;>lV0wCbADibeJ_l=Y<61xgN@@%$D{kJriE>l1jE07n3-K02 z6~qToQBn10&z>Em3J26lwEVOCH1mBU{ZXx%et64D-CnAA95`?QfvJP|$I_)stMc>n ze-j-Yor#1+4_dQk4F}ABW?gsh-VH<=)f9Q;0)&C}0>}+7YcvCCEd!|%K?2We2nVEx zPu#S;Mk1$f}1i=NS4k0JIGN$^w9rnMrfl4Fp?HD1a2-dIpmt zSFc|61@NRhUaxl;YKqa4l9G0%#+?|YCNT;f`QX8WJ%a-OijjGdNqDiI~b6ICi*LBbk|*!_Y_F zV%chf)oy&Yg89s3e}#q}QgVZMAIgM(wzjs8&Txn@(NO0y1pdfNv3jpnez}wm% zgqz)jfrc!SRhfu60ysLhL#o=ndp9R{-k|`B*bk@zWVZom3XKpZ?BT$VJbU-v8 zm&IhtZLzp50k8TvD=X{Yb#-+Ep=1TjG5X1B84g5Sx?P?2EJtp4Z_B>+sq&3~cd7WX<>;c~cDg1dTK zw{A_t=b$<^u?ku69JAPSaLeMtg$u$)-mH&V|5fIZBS+}%+qX$qR~NtO23NHodNyGz zmo8hjEDlq+$K#=9vv~rJ{lWQ4$W|aL4HAS$VEpxkBdv94b4D1)I#k zz<^>u8XX-a`T6-AOUeG(t&+74?=jEW&O8T80Udmf|9m(;cn{4c^13vLJW05^IHPr*3%_6>!#j8uQ4u)Tzv`P-bpBU>0RVjz V+LM#A{!st`002ovPDHLkV1mAIwRivk diff --git a/astrid/res/drawable-hdpi/popover_arrow_up.png b/astrid/res/drawable-hdpi/popover_arrow_up.png deleted file mode 100644 index acdeb1f0e8edd837d364be33b6b7f0ba8b694de2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1174 zcmV;H1Zn$;P)-1k+g+ICrQ3FQI{Wr}^WN+h0HBV8a2p;ThC-omWTEmWJ3c-ReSLjG z1huubfyb>Ev5E*Gwh;yJu@w>2(a`~2U0r^SCbW%2w943h^I3UN`$kjB?-OTKkKWY^uLk@86Hpwzl;V4$nybE%y z?lxBK>Zw)*)gu~gD(9w0zd;lCESH-O4MAZGpQR8 z7&nE;DbCeGUOSvu1euPKLafWkYB!sQ=U=uA(6*r5X4u8?-2RIu>3rVPInS}I5=hA0 z@)o@Q{@ZweJgmU2?kF779A7_k?RL*=cQXiTZ*PZiI1J6r%`$y7vVL}CWVOr4A*6Hr z=SJJq29czQGm^5^TDut~xwf_jot>RB$2YLS3PtUeT8K61!zPwBk}@nOP03~?C1|p;UErasWzZ|BkC=0k6po}BnK@UL zl+}{c$}vNrh^#8fjryWq9E3^rfG{caAV95^tnA!MxRTtvn^2fkf-Eb$Wjyb0v1RGC zo94KJ=n-pBWo2hie3*17H{hf-#JIj!Np7Kui3#ZG>48WjQm%5|A};$SE8Fs~tAjoK zjn!XCk+i>nSCq8kHurR4PA&6x4&TqGpswDUBRzi{* zWVdoFHvxA8J9krq6auRuH;FK5{$auhlctNEL3}`*weC${*ICXzp44IS+jh;}%8k1X zUuc7Rv5QF2<_=#$G1z}9QJez~=rf+uqe#wlI>6*u<+lDO8=t*;delJ%HFHmxm)H-6 zqV{=X7gjcsaHBg~^m%i=(z3Icn{Lz;2zn#A;aK6*&%|GR`^wYX9bdQ75K>Dk1S_{C o6yVA!SuWsMn>0o0YW@>o0EN}*u3g)gNB{r;07*qoM6N<$g3!7vw*UYD diff --git a/astrid/res/drawable-hdpi/popover_bg.9.png b/astrid/res/drawable-hdpi/popover_bg.9.png deleted file mode 100644 index 2d0dc7b9d5069f46212b7495c5b59524ac847a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 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 diff --git a/astrid/res/drawable-xhdpi/popover_bg.9.png b/astrid/res/drawable-xhdpi/popover_bg.9.png deleted file mode 100644 index 2d0dc7b9d5069f46212b7495c5b59524ac847a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1868 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 diff --git a/astrid/res/drawable/popover_arrow_up.png b/astrid/res/drawable/popover_arrow_up.png deleted file mode 100644 index 9c08e8113a23f21c02a35081a08f8c12ebc3e403..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1160 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 - - - - - - - - - - diff --git a/astrid/res/layout/help_popover.xml b/astrid/res/layout/help_popover.xml deleted file mode 100644 index 3ac5fa708..000000000 --- a/astrid/res/layout/help_popover.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 0be73a2a6..5e32fc7f3 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -409,17 +409,6 @@ actfm_sync_freq - - - showed_add_task_help - showed_tap_task_help - showed_lists_help - showed_list_settings_help - showed_collaborators_help - showed_when_shortcut - showed_when_row - tutorial - diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java index f36a576c3..4666b03ba 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java @@ -55,7 +55,6 @@ import com.todoroo.astrid.api.FilterWithUpdate; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagsPlugin; import com.todoroo.astrid.utility.AstridPreferences; -import com.todoroo.astrid.welcome.HelpInfoPopover; /** * Activity that displays a user's task lists and allows users @@ -457,11 +456,6 @@ public class FilterListFragment extends SherlockListFragment { adapter.getLists(); } - public void showAddListPopover() { - View anchor = getView().findViewById(R.id.new_list_button); - HelpInfoPopover.showPopover(getActivity(), anchor, R.string.help_popover_add_lists, null); - } - /** * Receiver which receives refresh intents * diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 3811159a1..e97af6ed8 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -346,9 +346,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { AstridActivity activity = (AstridActivity) getActivity(); setUpUIComponents(); - adjustInfoPopovers(); - - Preferences.setBoolean(R.string.p_showed_tap_task_help, true); overrideFinishAnim = false; if (activity != null) { @@ -1410,13 +1407,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { super.onStop(); } - private void adjustInfoPopovers() { - Preferences.setBoolean(R.string.p_showed_tap_task_help, true); - if (!Preferences.isSet(getString(R.string.p_showed_lists_help))) { - Preferences.setBoolean(R.string.p_showed_lists_help, false); - } - } - /* * ====================================================================== * ========================================== UI component helper classes diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 62d8ef3f4..340523271 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -109,7 +109,6 @@ import com.todoroo.astrid.ui.FeedbackPromptDialogs; import com.todoroo.astrid.ui.QuickAddBar; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; -import com.todoroo.astrid.welcome.HelpInfoPopover; import com.todoroo.astrid.widget.TasksWidget; /** @@ -688,13 +687,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele setUpBackgroundJobs(); - if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) { - showTaskCreateHelpPopover(); - } else if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) { - showTaskEditHelpPopover(); - } else if (!Preferences.getBoolean(R.string.p_showed_lists_help, false)) { - showListsHelp(); - } refreshFilterCount(); initiateAutomaticSync(); @@ -892,23 +884,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele } super.onActivityResult(requestCode, resultCode, data); - - if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) { - if(!AstridPreferences.canShowPopover()) { - return; - } - quickAddBar.getQuickAddBox().postDelayed(new Runnable() { - @Override - public void run() { - Activity activity = getActivity(); - if (activity != null) { - HelpInfoPopover.showPopover(getActivity(), quickAddBar.getQuickAddBox(), - R.string.help_popover_add_task, null); - Preferences.setBoolean(R.string.p_showed_add_task_help, true); - } - } - }, 1000); - } } public void onScroll(AbsListView view, int firstVisibleItem, @@ -1101,74 +1076,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele } } - private void showTaskCreateHelpPopover() { - if(!AstridPreferences.canShowPopover()) { - return; - } - if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) { - Preferences.setBoolean(R.string.p_showed_add_task_help, true); - HelpInfoPopover.showPopover(getActivity(), quickAddBar.getQuickAddBox(), - R.string.help_popover_add_task, null); - } - } - - public void showTaskEditHelpPopover() { - if(!AstridPreferences.canShowPopover()) { - return; - } - if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) { - quickAddBar.hideKeyboard(); - getListView().postDelayed(new Runnable() { - @Override - public void run() { - try { - if (taskAdapter != null && taskAdapter.getCount() > 0) { - final View view = getListView().getChildAt( - getListView().getChildCount() - 1); - if (view != null) { - Activity activity = getActivity(); - if (activity != null) { - HelpInfoPopover.showPopover(getActivity(), view, - R.string.help_popover_tap_task, null); - Preferences.setBoolean(R.string.p_showed_tap_task_help, true); - } - } - } - } catch (IllegalStateException e) { - // Whoops, view is gone. Try again later - } - } - }, 1000L); - - } - } - - private void showListsHelp() { - if(!AstridPreferences.canShowPopover()) { - return; - } - if (!Preferences.getBoolean( - R.string.p_showed_lists_help, false)) { - AstridActivity activity = (AstridActivity) getActivity(); - if (activity != null) { - if (AstridPreferences.useTabletLayout(activity)) { - FilterListFragment flf = activity.getFilterListFragment(); - if (flf != null) { - flf.showAddListPopover(); - } - } else { - ActionBar ab = activity.getSupportActionBar(); - View anchor = ab.getCustomView().findViewById(R.id.lists_nav); - HelpInfoPopover.showPopover(activity, - anchor, R.string.help_popover_switch_lists, null); - } - Preferences.setBoolean( - R.string.p_showed_lists_help, - true); - } - } - } - /* * ====================================================================== * ============================================================== actions diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java index ed0e27f6f..21c9d633f 100644 --- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java @@ -334,7 +334,6 @@ public class QuickAddBar extends LinearLayout { addToCalendar(task, title); if(!TextUtils.isEmpty(title)) { - fragment.showTaskEditHelpPopover(); } if (activity instanceof TaskListActivity && !assignedToMe) { diff --git a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java b/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java deleted file mode 100644 index c1740324f..000000000 --- a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.welcome; - -import greendroid.widget.QuickAction; -import greendroid.widget.QuickActionWidget; - -import java.util.List; - -import android.app.Activity; -import android.content.Context; -import android.graphics.Rect; -import android.view.View; -import android.view.ViewGroup; -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. - * - * @author Sam Bosley - * - */ -public class HelpInfoPopover extends QuickActionWidget { - - public static HelpInfoPopover showPopover(final Activity activity, final View parent, - final int textId, OnDismissListener dismissListener) { - final HelpInfoPopover toShow = new HelpInfoPopover(activity, textId); - if (dismissListener != null) { - toShow.setOnDismissListener(dismissListener); - } - parent.postDelayed(new Runnable() { - @Override - public void run() { - try { - toShow.show(parent); - } catch (Exception e) { - //Activity wasn't running or something like that - } - } - }, 250); - return toShow; - } - - private final boolean tablet; - private int measuredWidth; - - private HelpInfoPopover(Context context, int textId) { - super(context); - setContentView(R.layout.help_popover); - TextView message = (TextView)getContentView().findViewById(R.id.gdi_message); - message.setText(textId); - setFocusable(false); - setTouchable(true); - measuredWidth = -1; // uninitialized - tablet = AstridPreferences.useTabletLayout(context); - } - - @Override - protected void populateQuickActions(List quickActions) { - // Do nothing - } - - @Override - protected int getArrowLeftMargin(View arrow) { - if (measuredWidth > 0) { - return (measuredWidth - arrow.getMeasuredWidth()) / 2; - } - - if (tablet) { - return mRect.width() / 4; - } - return mRect.width() / 2; - } - - @Override - protected int getShowAtX() { - if (measuredWidth > 0) { - return mRect.left + (mRect.width() - measuredWidth) / 2; - } - return mRect.left; - } - - @Override - protected void onMeasureAndLayout(Rect anchorRect, View contentView) { - contentView.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - contentView.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); - - int rootHeight = contentView.getMeasuredHeight(); - measuredWidth = contentView.getMeasuredWidth(); - - int offsetY = getArrowOffsetY(); - int dyTop = anchorRect.top; - int dyBottom = getScreenHeight() - anchorRect.bottom; - - boolean onTop = (dyTop > dyBottom); - int popupY = (onTop) ? anchorRect.top - rootHeight + offsetY : anchorRect.bottom - offsetY; - - setWidgetSpecs(popupY, onTop); - } - -}