Merge "Don't pause webview timers as we're rendering a preloaded tab."
diff --git a/res/drawable-hdpi/browser_background_holo.9.png b/res/drawable-hdpi/browser_background_holo.9.png
new file mode 100644
index 0000000..840ed27
--- /dev/null
+++ b/res/drawable-hdpi/browser_background_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/browser_background_holo.9.png b/res/drawable-mdpi/browser_background_holo.9.png
new file mode 100644
index 0000000..f84e6a3
--- /dev/null
+++ b/res/drawable-mdpi/browser_background_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/browser_background_holo.9.png b/res/drawable-xhdpi/browser_background_holo.9.png
new file mode 100644
index 0000000..0853b34
--- /dev/null
+++ b/res/drawable-xhdpi/browser_background_holo.9.png
Binary files differ
diff --git a/res/drawable/nav_screen_bg.xml b/res/drawable/nav_screen_bg.xml
deleted file mode 100644
index 7ca4e78..0000000
--- a/res/drawable/nav_screen_bg.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<shape
- xmlns:android="http://schemas.android.com/apk/res/android">
- <gradient
- android:type="linear"
- android:startColor="#ff000000"
- android:centerColor="#ff808080"
- android:endColor="#ff000000"
- android:centerY="0.2"
- android:angle="90" />
-</shape>
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index 5a3a037..66af2c8 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -19,7 +19,7 @@
android:id="@+id/nav_screen"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/nav_screen_bg" >
+ android:background="@drawable/browser_background_holo" >
<LinearLayout
android:id="@+id/tabbar"
android:orientation="horizontal"
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 4e00fa3..4c74991 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@drawable/nav_screen_bg">
+ android:background="@drawable/browser_background_holo">
<com.android.browser.NavTabGallery
android:id="@+id/scroller"
android:layout_width="match_parent"
