ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Be explicit about disabling drag n drop in search"

This commit is contained in:
Ben Komalo 2011-07-04 15:59:00 -07:00 committed by Android (Google) Code Review
parent b8dc7beca2 1b4b6cf560
commit 0268581de2
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/email/activity/ThreePaneLayout.java
View File

@ -273,6 +273,16 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
return ret;
}
public boolean isLeftPaneVisible() {
return mLeftPane.getVisibility() == View.VISIBLE;
}
public boolean isMiddlePaneVisible() {
return mMiddlePane.getVisibility() == View.VISIBLE;
}
public boolean isRightPaneVisible() {
return mRightPane.getVisibility() == View.VISIBLE;
}
/**
* Handles the back event.
*

11
src/com/android/email/activity/UIControllerTwoPane.java
View File

@ -43,8 +43,7 @@ import java.util.Set;
* Note: Always use {@link #commitFragmentTransaction} to operate fragment transactions,
* so that we can easily switch between synchronous and asynchronous transactions.
*/
class UIControllerTwoPane extends UIControllerBase implements
ThreePaneLayout.Callback {
class UIControllerTwoPane extends UIControllerBase implements ThreePaneLayout.Callback {
@VisibleForTesting
static final int MAILBOX_REFRESH_MIN_INTERVAL = 30 * 1000; // in milliseconds
@ -186,8 +185,9 @@ class UIControllerTwoPane extends UIControllerBase implements
public boolean onDragStarted() {
Log.w(Logging.LOG_TAG, "Drag started");
if ((mThreePane.getVisiblePanes() & ThreePaneLayout.PANE_LEFT) == 0) {
// Mailbox list hidden. D&D not allowed.
if (((mListContext != null) && mListContext.isSearch())
|| !mThreePane.isLeftPaneVisible()) {
// D&D not allowed.
return false;
}
@ -701,8 +701,7 @@ class UIControllerTwoPane extends UIControllerBase implements
@Override
public int getTitleMode() {
final int visiblePanes = mThreePane.getVisiblePanes();
if ((mThreePane.getVisiblePanes() & ThreePaneLayout.PANE_LEFT) != 0) {
if (mThreePane.isLeftPaneVisible()) {
// Mailbox list visible
return TITLE_MODE_ACCOUNT_NAME_ONLY;
} else {