Bug 850217: Corruption in opt-in animation. [r=bnicholson]

--HG--
extra : rebase_source : 7b83bf28a76c3308fa734d0e07ef840362f62ead
This commit is contained in:
Sriram Ramasubramanian 2013-03-22 16:38:11 -07:00
parent f2d00f14f9
commit edc3877cdc
2 changed files with 42 additions and 36 deletions

View File

@ -668,7 +668,7 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
anim1.setDuration(ANIMATION_DURATION);
anim1.setInterpolator(new AccelerateInterpolator());
anim1.setFillAfter(true);
mSuggestionsOptInPrompt.setAnimation(anim1);
mSuggestionsOptInPrompt.findViewById(R.id.prompt_container).setAnimation(anim1);
TranslateAnimation anim2 = new TranslateAnimation(0, 0, 0, -1 * mSuggestionsOptInPrompt.getHeight());
anim2.setDuration(ANIMATION_DURATION);

View File

@ -5,13 +5,17 @@
<view xmlns:android="http://schemas.android.com/apk/res/android"
class="org.mozilla.gecko.AwesomeBarTabs$BackgroundLayout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/address_bar_bg">
<LinearLayout android:id="@+id/prompt_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:minHeight="@dimen/awesomebar_row_height"
android:gravity="center_vertical"
android:padding="10dip"
android:background="@drawable/address_bar_bg">
android:padding="10dip">
<Gecko.TextView android:id="@+id/suggestions_prompt_title"
android:layout_height="wrap_content"
@ -47,4 +51,6 @@
android:clickable="true"
android:text="@string/button_no" />
</LinearLayout>
</view>