Merge "Include these property setters."
diff --git a/proguard.flags b/proguard.flags
index 6996693..c3f7930 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -35,3 +35,12 @@
-keepclasseswithmembers class com.android.mail.ui.ConversationViewFragment$MailJsBridge {
public <methods>;
}
+
+-keepclasseswithmembers class com.android.mail.ui.TwoPaneLayout {
+ *** setFoldersLeft(...);
+ *** setListBitmapLeft(...);
+ *** setListBitmapAlpha(...);
+ *** setListLeft(...);
+ *** setListAlpha(...);
+ *** setConversationLeft(...);
+}
\ No newline at end of file
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index f192909..07b39a2 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java
@@ -676,7 +676,7 @@
* Not to be used externally.
* @hide
*/
- private void setConversationLeft(int left) {
+ public void setConversationLeft(int left) {
mConversationLeft = left;
invalidate();
}
@@ -718,14 +718,12 @@
requestLayout();
}
- // TODO(viki): I think most of the next methods aren't being used. Rather than removing them,
- // I'm marking them private to remove once the application is complete.
/**
* Sets the left position of the folders fragment. Used by animators. Not to
* be used externally.
* @hide
*/
- private void setFoldersLeft(int left) {
+ public void setFoldersLeft(int left) {
mFoldersLeft = left;
invalidate();
}
@@ -734,7 +732,7 @@
* Sets the alpha of the conversation list. Used by animators. Not to be used externally.
* @hide
*/
- private void setListAlpha(int alpha) {
+ public void setListAlpha(int alpha) {
mListAlpha = alpha;
invalidate();
}
@@ -743,7 +741,7 @@
* Sets the alpha of the conversation list bitmap. Used by animators. Not to be used externally.
* @hide
*/
- private void setListBitmapAlpha(int alpha) {
+ public void setListBitmapAlpha(int alpha) {
mListPaint.setAlpha(alpha);
invalidate();
}
@@ -753,7 +751,7 @@
* externally.
* @hide
*/
- private void setListBitmapLeft(int left) {
+ public void setListBitmapLeft(int left) {
mListBitmapLeft = left;
invalidate();
}
@@ -770,7 +768,7 @@
* externally.
* @hide
*/
- private void setListLeft(int left) {
+ public void setListLeft(int left) {
mListLeft = left;
invalidate();
}