Don't change ToastBar bottom margin.
With no conversation view pager title strip,
we don't ever need to change the height.
Change-Id: I7d18919a156296f3ed8bd0f2e1098e6085b1469c
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index a8c67f4..297849b 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -91,8 +91,6 @@
<dimen name="widget_margin_right">0dip</dimen>
<dimen name="widget_margin_bottom">0dip</dimen>
<dimen name="search_view_width">400dip</dimen>
- <dimen name="toast_bar_bottom_margin">4dip</dimen>
- <dimen name="toast_bar_bottom_margin_in_conversation">24dip</dimen>
<dimen name="wait_padding">16dp</dimen>
<integer name="chips_max_lines">2</integer>
<dimen name="tile_letter_font_size">33dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 781bf10..61adc6a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -419,6 +419,7 @@
<item name="android:layout_gravity">bottom</item>
<item name="android:layout_marginLeft">4dip</item>
<item name="android:layout_marginRight">4dip</item>
+ <item name="android:layout_marginBottom">4dip</item>
<item name="android:orientation">horizontal</item>
<item name="android:gravity">center_vertical</item>
<item name="android:background">@drawable/panel_undo_holo</item>
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 43bcd74..edc1e33 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -3850,7 +3850,6 @@
* @param replaceVisibleToast if true, this should replace any currently visible toast.
*/
protected final void showErrorToast(final Folder folder, boolean replaceVisibleToast) {
- mToastBar.setConversationMode(false);
final ActionClickedListener listener;
final int actionTextResourceId;
diff --git a/src/com/android/mail/ui/ActionableToastBar.java b/src/com/android/mail/ui/ActionableToastBar.java
index 4cdcd20..5beade7 100644
--- a/src/com/android/mail/ui/ActionableToastBar.java
+++ b/src/com/android/mail/ui/ActionableToastBar.java
@@ -23,7 +23,6 @@
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
-import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -39,8 +38,6 @@
private Animator mHideAnimation;
private final Runnable mRunnable;
private final Handler mFadeOutHandler;
- private final int mBottomMarginSizeInConversation;
- private final int mBottomMarginSize;
/** How long toast will last in ms */
private static final long TOAST_LIFETIME = 15*1000L;
@@ -76,10 +73,6 @@
}
}
};
- mBottomMarginSize = context.getResources()
- .getDimensionPixelSize(R.dimen.toast_bar_bottom_margin);
- mBottomMarginSizeInConversation = context.getResources().getDimensionPixelSize(
- R.dimen.toast_bar_bottom_margin_in_conversation);
LayoutInflater.from(context).inflate(R.layout.actionable_toast_row, this, true);
}
@@ -95,18 +88,6 @@
}
/**
- * Tells the view that it will be appearing in the conversation pane
- * and should adjust its layout parameters accordingly.
- * @param isInConversationMode true if the view will be shown in the conversation view
- */
- public void setConversationMode(boolean isInConversationMode) {
- final FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) getLayoutParams();
- params.bottomMargin = isInConversationMode ? mBottomMarginSizeInConversation
- : mBottomMarginSize;
- setLayoutParams(params);
- }
-
- /**
* Displays the toast bar and makes it visible. Allows the setting of
* parameters to customize the display.
* @param listener Performs some action when the action button is clicked.
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 51a91d4..ffd1a04 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -510,7 +510,6 @@
switch (mode) {
case ViewMode.SEARCH_RESULTS_CONVERSATION:
case ViewMode.CONVERSATION:
- mToastBar.setConversationMode(true);
mToastBar.show(getUndoClickedListener(
convList != null ? convList.getAnimatedAdapter() : null),
0,
@@ -524,7 +523,6 @@
case ViewMode.SEARCH_RESULTS_LIST:
case ViewMode.CONVERSATION_LIST:
if (convList != null) {
- mToastBar.setConversationMode(false);
mToastBar.show(
getUndoClickedListener(convList.getAnimatedAdapter()),
0,
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index e71ec7b..1127956 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -508,7 +508,6 @@
- params.rightMargin;
params.gravity = Gravity.BOTTOM | Gravity.RIGHT;
mToastBar.setLayoutParams(params);
- mToastBar.setConversationMode(false);
break;
case ViewMode.SEARCH_RESULTS_CONVERSATION:
case ViewMode.CONVERSATION:
@@ -518,14 +517,12 @@
params.width = mLayout.computeConversationListWidth() - params.leftMargin
- params.rightMargin;
mToastBar.setLayoutParams(params);
- mToastBar.setConversationMode(false);
} else {
// Show undo bar in the conversation.
params.gravity = Gravity.BOTTOM | Gravity.RIGHT;
params.width = mLayout.computeConversationWidth() - params.leftMargin
- params.rightMargin;
mToastBar.setLayoutParams(params);
- mToastBar.setConversationMode(true);
}
break;
}