diff options
| -rw-r--r-- | res/drawable-hdpi/ic_compose_56dp.png | bin | 4964 -> 6365 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_compose_pressed_56dp.png | bin | 4889 -> 6323 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_compose_56dp.png | bin | 4393 -> 4964 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_compose_pressed_56dp.png | bin | 4375 -> 4889 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_compose_56dp.png | bin | 6380 -> 7645 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_compose_pressed_56dp.png | bin | 6339 -> 7631 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_compose_56dp.png | bin | 7643 -> 10383 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_compose_pressed_56dp.png | bin | 7652 -> 10281 bytes | |||
| -rw-r--r-- | src/com/android/mail/ui/AbstractActivityController.java | 11 |
9 files changed, 9 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_compose_56dp.png b/res/drawable-hdpi/ic_compose_56dp.png Binary files differindex 98f2c918f..75dd9b23f 100644 --- a/res/drawable-hdpi/ic_compose_56dp.png +++ b/res/drawable-hdpi/ic_compose_56dp.png diff --git a/res/drawable-hdpi/ic_compose_pressed_56dp.png b/res/drawable-hdpi/ic_compose_pressed_56dp.png Binary files differindex 0ccc5051f..e058e658e 100644 --- a/res/drawable-hdpi/ic_compose_pressed_56dp.png +++ b/res/drawable-hdpi/ic_compose_pressed_56dp.png diff --git a/res/drawable-mdpi/ic_compose_56dp.png b/res/drawable-mdpi/ic_compose_56dp.png Binary files differindex 8aeeb17c8..98f2c918f 100644 --- a/res/drawable-mdpi/ic_compose_56dp.png +++ b/res/drawable-mdpi/ic_compose_56dp.png diff --git a/res/drawable-mdpi/ic_compose_pressed_56dp.png b/res/drawable-mdpi/ic_compose_pressed_56dp.png Binary files differindex dff7c0391..0ccc5051f 100644 --- a/res/drawable-mdpi/ic_compose_pressed_56dp.png +++ b/res/drawable-mdpi/ic_compose_pressed_56dp.png diff --git a/res/drawable-xhdpi/ic_compose_56dp.png b/res/drawable-xhdpi/ic_compose_56dp.png Binary files differindex 1f06eb979..e1179193d 100644 --- a/res/drawable-xhdpi/ic_compose_56dp.png +++ b/res/drawable-xhdpi/ic_compose_56dp.png diff --git a/res/drawable-xhdpi/ic_compose_pressed_56dp.png b/res/drawable-xhdpi/ic_compose_pressed_56dp.png Binary files differindex cab4987f7..a93ecdc81 100644 --- a/res/drawable-xhdpi/ic_compose_pressed_56dp.png +++ b/res/drawable-xhdpi/ic_compose_pressed_56dp.png diff --git a/res/drawable-xxhdpi/ic_compose_56dp.png b/res/drawable-xxhdpi/ic_compose_56dp.png Binary files differindex 5595dc181..3b0b5fb35 100644 --- a/res/drawable-xxhdpi/ic_compose_56dp.png +++ b/res/drawable-xxhdpi/ic_compose_56dp.png diff --git a/res/drawable-xxhdpi/ic_compose_pressed_56dp.png b/res/drawable-xxhdpi/ic_compose_pressed_56dp.png Binary files differindex be9799c3a..55655ef4b 100644 --- a/res/drawable-xxhdpi/ic_compose_pressed_56dp.png +++ b/res/drawable-xxhdpi/ic_compose_pressed_56dp.png diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java index 96cc4b9a6..96f3c4626 100644 --- a/src/com/android/mail/ui/AbstractActivityController.java +++ b/src/com/android/mail/ui/AbstractActivityController.java @@ -292,6 +292,9 @@ public abstract class AbstractActivityController implements ActivityController, * Action menu associated with the selected set. */ SelectedConversationsActionMenu mCabActionMenu; + + /** The compose button floating over the conversation/search lists */ + protected View mFloatingComposeButton; protected ActionableToastBar mToastBar; protected ConversationPagerController mPagerController; @@ -1271,8 +1274,8 @@ public abstract class AbstractActivityController implements ActivityController, mRecentFolderList.initialize(mActivity); mVeiledMatcher.initialize(this); - final View composeButton = mActivity.findViewById(R.id.compose_button); - composeButton.setOnClickListener(this); + mFloatingComposeButton = mActivity.findViewById(R.id.compose_button); + mFloatingComposeButton.setOnClickListener(this); mDrawerToggle = new ActionBarDrawerToggle(mActivity, mDrawerContainer, R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close); @@ -2175,6 +2178,10 @@ public abstract class AbstractActivityController implements ActivityController, */ @Override public void onViewModeChanged(int newMode) { + // The floating action compose button is only visible in the conversation/search lists + final int composeVisible = ViewMode.isListMode(newMode) ? View.VISIBLE : View.GONE; + mFloatingComposeButton.setVisibility(composeVisible); + // When we step away from the conversation mode, we don't have a current conversation // anymore. Let's blank it out so clients calling getCurrentConversation are not misled. if (!ViewMode.isConversationMode(newMode)) { |
