summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-29 14:05:48 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-29 14:05:48 -0400
commit458c81a357d078f8fcb701f27a287c9e634903a7 (patch)
tree4ee564ae8910f77541852be233e57f44c54217b3
parenta04645545690d9f637ccae4d043a5a1b8478a832 (diff)
parent67f0a56ddf18884a27d353189ffb6e77938a6d55 (diff)
downloadpackages_apps_browser-458c81a357d078f8fcb701f27a287c9e634903a7.zip
packages_apps_browser-458c81a357d078f8fcb701f27a287c9e634903a7.tar.gz
packages_apps_browser-458c81a357d078f8fcb701f27a287c9e634903a7.tar.bz2
Merge change I67f0a56d into eclair
* changes: Enable fading scrollbar for the Browser
-rw-r--r--res/layout/browser_subwindow.xml2
-rw-r--r--src/com/android/browser/TabControl.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index 5b00bf7..0eb9e72 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -30,6 +30,8 @@
<WebView android:id="@+id/webview"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
+ android:fadeScrollbars="true"
+ android:scrollbarStyle="outsideOverlay"
android:layout_weight="1" />
</LinearLayout>
</FrameLayout>
diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index 3de60a3..2f15a9c 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -1022,6 +1022,8 @@ class TabControl {
private WebView createNewWebView() {
// Create a new WebView
WebView w = new WebView(mActivity);
+ w.setScrollbarFadingEnabled(true);
+ w.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
w.setMapTrackballToArrowKeys(false); // use trackball directly
// Enable the built-in zoom
w.getSettings().setBuiltInZoomControls(true);