wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
--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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/awesomebar/AllPagesTab.java
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);

76
mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
View File

@ -7,44 +7,50 @@
class="org.mozilla.gecko.AwesomeBarTabs$BackgroundLayout"
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">
<Gecko.TextView android:id="@+id/suggestions_prompt_title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="@color/awesome_bar_title"
android:layout_marginLeft="6dip"
android:textSize="13sp"
android:layout_weight="1" />
<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">
<TextView android:id="@+id/suggestions_prompt_yes"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="13sp"
android:layout_marginLeft="15dip"
android:background="@drawable/suggestion_selector"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:clickable="true"
android:text="@string/button_yes" />
<Gecko.TextView android:id="@+id/suggestions_prompt_title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textColor="@color/awesome_bar_title"
android:layout_marginLeft="6dip"
android:textSize="13sp"
android:layout_weight="1" />
<TextView android:id="@+id/suggestions_prompt_no"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="13sp"
android:layout_marginLeft="6dip"
android:background="@drawable/suggestion_selector"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:clickable="true"
android:text="@string/button_no" />
<TextView android:id="@+id/suggestions_prompt_yes"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="13sp"
android:layout_marginLeft="15dip"
android:background="@drawable/suggestion_selector"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:clickable="true"
android:text="@string/button_yes" />
<TextView android:id="@+id/suggestions_prompt_no"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="13sp"
android:layout_marginLeft="6dip"
android:background="@drawable/suggestion_selector"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:clickable="true"
android:text="@string/button_no" />
</LinearLayout>
</view>