diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 12:03:40 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 12:03:40 -0400 |
| commit | 306feaf596407d33ab8157d63b1788789a6accd4 (patch) | |
| tree | 38b3ca06a14e223dd4ca7c72e3837dd7a3f2fdec /src | |
| parent | bd955bf11e88920aa44ae9b043b7bfb8573bbc4a (diff) | |
| parent | 83932c74ba031eb2f581f1557c1a90f4b5bbb423 (diff) | |
| download | packages_apps_Browser-306feaf596407d33ab8157d63b1788789a6accd4.tar.gz packages_apps_Browser-306feaf596407d33ab8157d63b1788789a6accd4.tar.bz2 packages_apps_Browser-306feaf596407d33ab8157d63b1788789a6accd4.zip | |
Merge change Ibf40bd9e into eclair
* changes:
Slide the title bar onto the screen rather than stretching it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 1954dadad..1e7361bfc 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1021,8 +1021,7 @@ public class BrowserActivity extends Activity params.gravity = Gravity.TOP; WebView mainView = mTabControl.getCurrentWebView(); boolean atTop = mainView != null && mainView.getScrollY() == 0; - params.windowAnimations = atTop ? 0 - : com.android.internal.R.style.Animation_DropDownDown; + params.windowAnimations = atTop ? 0 : R.style.TitleBar; // XXX : Without providing an offset, the fake title bar will be // placed underneath the status bar. Use the global visible rect // of mBrowserFrameLayout to determine the bottom of the status bar @@ -1063,7 +1062,7 @@ public class BrowserActivity extends Activity // fake title bar was displayed. Make sure it has the appropriate // animation/lack thereof before removing. params.windowAnimations = mainView != null && mainView.getScrollY() == 0 - ? 0 : com.android.internal.R.style.Animation_DropDownDown; + ? 0 : R.style.TitleBar; WindowManager manager = (WindowManager) getSystemService(Context.WINDOW_SERVICE); manager.updateViewLayout(mFakeTitleBarHolder, params); |