diff options
| author | John Reck <jreck@google.com> | 2011-03-14 12:51:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 12:51:00 -0700 |
| commit | bc9b5f0f284ad59a28e3c578630e3c9eb6dba99e (patch) | |
| tree | 5548d15568903685992ead223c196eb00af93027 /src/com/android/browser | |
| parent | 56de1a2ba6bb82f4eaf5930fcbbf799f071526ce (diff) | |
| parent | 74830e168f578bb511240f95d373667565f0623f (diff) | |
| download | packages_apps_Browser-bc9b5f0f284ad59a28e3c578630e3c9eb6dba99e.tar.gz packages_apps_Browser-bc9b5f0f284ad59a28e3c578630e3c9eb6dba99e.tar.bz2 packages_apps_Browser-bc9b5f0f284ad59a28e3c578630e3c9eb6dba99e.zip | |
Merge "Partial revert of CL 101621" into honeycomb-mr1
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/BaseUi.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java index 589868008..71346ae35 100644 --- a/src/com/android/browser/BaseUi.java +++ b/src/com/android/browser/BaseUi.java @@ -17,8 +17,11 @@ package com.android.browser; import com.android.browser.Tab.LockIcon; +import com.android.browser.UI.DropdownChangeListener; -import android.animation.LayoutTransition; +import android.animation.Animator; +import android.animation.Animator.AnimatorListener; +import android.animation.ObjectAnimator; import android.app.Activity; import android.content.res.Configuration; import android.content.res.Resources; @@ -111,7 +114,6 @@ public abstract class BaseUi implements UI, WebViewFactory { .inflate(R.layout.custom_screen, null); mContentView = (FrameLayout) mBrowserFrameLayout.findViewById( R.id.main_content); - mContentView.setLayoutTransition(new LayoutTransition()); mErrorConsoleContainer = (LinearLayout) mBrowserFrameLayout .findViewById(R.id.error_console); mCustomViewContainer = (FrameLayout) mBrowserFrameLayout @@ -459,6 +461,11 @@ public abstract class BaseUi implements UI, WebViewFactory { WebView web = mActiveTab.getWebView(); mActiveTab.putInBackground(); } + mComboView.setAlpha(0f); + ObjectAnimator anim = ObjectAnimator.ofFloat(mComboView, "alpha", 0f, 1f); + Resources res = mActivity.getResources(); + anim.setDuration(res.getInteger(R.integer.comboViewFadeInDuration)); + anim.start(); mContentView.addView(mComboView, COVER_SCREEN_PARAMS); } |