diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-08-06 05:34:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:34:22 +0000 |
| commit | 81edb47b20a4ec56c233937217166a9f3cebeb7b (patch) | |
| tree | f474ec384c0256a2c7724bcd8009de0557c4dd8a /src | |
| parent | 27e19e4d9bd9a6c4a2ac971b81b48608055755bc (diff) | |
| parent | f8e065aab2cbff4dee86cc931a4d9c88dec37345 (diff) | |
| download | android_packages_apps_UnifiedEmail-81edb47b20a4ec56c233937217166a9f3cebeb7b.tar.gz android_packages_apps_UnifiedEmail-81edb47b20a4ec56c233937217166a9f3cebeb7b.tar.bz2 android_packages_apps_UnifiedEmail-81edb47b20a4ec56c233937217166a9f3cebeb7b.zip | |
Merge "Disable snap headers for SCV." into ub-gmail-ur14-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/browse/ConversationContainer.java | 7 | ||||
| -rw-r--r-- | src/com/android/mail/ui/SecureConversationViewController.java | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java index bfb959b7a..a5e82b177 100644 --- a/src/com/android/mail/browse/ConversationContainer.java +++ b/src/com/android/mail/browse/ConversationContainer.java @@ -280,14 +280,11 @@ public class ConversationContainer extends ViewGroup implements ScrollListener { } } - public Adapter getOverlayAdapter() { - return mOverlayAdapter; - } - public void setAccountController(ConversationAccountController controller) { mAccountController = controller; - mSnapEnabled = isSnapEnabled(); +// mSnapEnabled = isSnapEnabled(); + mSnapEnabled = false; // TODO - re-enable when dogfooders howl } /** diff --git a/src/com/android/mail/ui/SecureConversationViewController.java b/src/com/android/mail/ui/SecureConversationViewController.java index 23a1e9af0..ea38e5dff 100644 --- a/src/com/android/mail/ui/SecureConversationViewController.java +++ b/src/com/android/mail/ui/SecureConversationViewController.java @@ -182,11 +182,12 @@ public class SecureConversationViewController implements // If we have scrolled further than the distance from the top of the scrollView to the top // of the message header, then the message header is at least partially ofscreen. As soon // as the message header goes partially offscreen we need to display the snap header. - if (y > rect.top) { - mSnapHeaderView.setVisibility(View.VISIBLE); - } else { + // TODO - re-enable when dogfooders howl +// if (y > rect.top) { +// mSnapHeaderView.setVisibility(View.VISIBLE); +// } else { mSnapHeaderView.setVisibility(View.GONE); - } +// } } /** |