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 702287: Caret should be shown throughtout the animation [r=mfinkle]

Browse Source
This commit is contained in:
Sriram Ramasubramanian 2011-11-14 15:30:34 -08:00
parent 8913a79c96
commit f1e9e3e831
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
embedding/android/BrowserToolbar.java
View File

@ -70,7 +70,9 @@ public class BrowserToolbar extends LinearLayout {
final private Context mContext; final private Context mContext;
final private Handler mHandler; final private Handler mHandler;
final private int mColor; final private int mColor;
final private int mCounterColor;
final private int mDuration;
final private TranslateAnimation mSlideUpIn; final private TranslateAnimation mSlideUpIn;
final private TranslateAnimation mSlideUpOut; final private TranslateAnimation mSlideUpOut;
final private TranslateAnimation mSlideDownIn; final private TranslateAnimation mSlideDownIn;
@ -112,13 +114,15 @@ public class BrowserToolbar extends LinearLayout {
}); });
mTabs.setImageLevel(1); mTabs.setImageLevel(1);
mCounterColor = 0x99ffffff;
mTabsCount = (TextSwitcher) findViewById(R.id.tabs_count); mTabsCount = (TextSwitcher) findViewById(R.id.tabs_count);
mTabsCount.setFactory(new ViewFactory() { mTabsCount.setFactory(new ViewFactory() {
public View makeView() { public View makeView() {
TextView text = new TextView(mContext); TextView text = new TextView(mContext);
text.setGravity(Gravity.CENTER); text.setGravity(Gravity.CENTER);
text.setTextSize(16); text.setTextSize(16);
text.setTextColor(0x99ffffff); text.setTextColor(mCounterColor);
text.setTypeface(text.getTypeface(), Typeface.BOLD); text.setTypeface(text.getTypeface(), Typeface.BOLD);
return text; return text;
} }
@ -135,10 +139,11 @@ public class BrowserToolbar extends LinearLayout {
mSlideDownIn = new TranslateAnimation(0, 0, -30, 0); mSlideDownIn = new TranslateAnimation(0, 0, -30, 0);
mSlideDownOut = new TranslateAnimation(0, 0, 0, 30); mSlideDownOut = new TranslateAnimation(0, 0, 0, 30);
mSlideUpIn.setDuration(750); mDuration = 750;
mSlideUpOut.setDuration(750); mSlideUpIn.setDuration(mDuration);
mSlideDownIn.setDuration(750); mSlideUpOut.setDuration(mDuration);
mSlideDownOut.setDuration(750); mSlideDownIn.setDuration(mDuration);
mSlideDownOut.setDuration(mDuration);
} }
private void onAwesomeBarSearch() { private void onAwesomeBarSearch() {
@ -166,20 +171,32 @@ public class BrowserToolbar extends LinearLayout {
mTabsCount.setOutAnimation(mSlideUpOut); mTabsCount.setOutAnimation(mSlideUpOut);
} }
mTabs.setImageLevel(0); if (count > 1)
mTabs.setImageLevel(count);
else
mTabs.setImageLevel(0);
mTabsCount.setVisibility(View.VISIBLE); mTabsCount.setVisibility(View.VISIBLE);
mTabsCount.setText(String.valueOf(count)); mTabsCount.setText(String.valueOf(count));
mCount = count; mCount = count;
mHandler.postDelayed(new Runnable() { mHandler.postDelayed(new Runnable() {
public void run() { public void run() {
int count = Tabs.getInstance().getCount(); ((TextView) mTabsCount.getCurrentView()).setTextColor(mColor);
mTabs.setImageLevel(count);
if (count == 1)
mTabsCount.setVisibility(View.GONE);
} }
}, 1500); }, mDuration);
mHandler.postDelayed(new Runnable() {
public void run() {
if (Tabs.getInstance().getCount() == 1) {
mTabs.setImageLevel(1);
mTabsCount.setVisibility(View.GONE);
((TextView) mTabsCount.getCurrentView()).setTextColor(mCounterColor);
} else {
((TextView) mTabsCount.getCurrentView()).setTextColor(mCounterColor);
}
}
}, 2 * mDuration);
} }
public void setProgressVisibility(boolean visible) { public void setProgressVisibility(boolean visible) {