summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2014-08-05 19:22:25 -0700
committerAndrew Sapperstein <asapperstein@google.com>2014-08-05 19:22:25 -0700
commitf8e065aab2cbff4dee86cc931a4d9c88dec37345 (patch)
tree73047668b6a50d1f8856746a7c9520388538b59f /src
parent73b8c1885d326e077b923fac24d04dd4ceead8c0 (diff)
downloadandroid_packages_apps_UnifiedEmail-f8e065aab2cbff4dee86cc931a4d9c88dec37345.tar.gz
android_packages_apps_UnifiedEmail-f8e065aab2cbff4dee86cc931a4d9c88dec37345.tar.bz2
android_packages_apps_UnifiedEmail-f8e065aab2cbff4dee86cc931a4d9c88dec37345.zip
Disable snap headers for SCV.
Change-Id: I69666b72d94bdb70f997f6324c69db27ccf152fc
Diffstat (limited to 'src')
-rw-r--r--src/com/android/mail/browse/ConversationContainer.java7
-rw-r--r--src/com/android/mail/ui/SecureConversationViewController.java9
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);
- }
+// }
}
/**