diff options
| author | Michael Kolb <kolby@google.com> | 2011-09-02 15:44:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-02 15:44:47 -0700 |
| commit | 4f79a14a8aa067463dad15a018370012ed593608 (patch) | |
| tree | e4b4184d265e162999cfdc3aa8342b5f01b3b538 | |
| parent | 306ea37b9802685483f30cc0e8d6c42adacc8410 (diff) | |
| parent | ef8b0b9b978011e7899bada510b0fb2ea8708ae3 (diff) | |
| download | packages_apps_Browser-4f79a14a8aa067463dad15a018370012ed593608.zip packages_apps_Browser-4f79a14a8aa067463dad15a018370012ed593608.tar.gz packages_apps_Browser-4f79a14a8aa067463dad15a018370012ed593608.tar.bz2 | |
Merge "Assign urlbar background to actionbar"
| -rw-r--r-- | res/values-sw600dp/styles.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 41e09ae..699f10a 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -24,4 +24,8 @@ </style> <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView"> </style> + <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar"> + <item name="android:background">@drawable/bg_browsertabs</item> + <item name="android:displayOptions"></item> + </style> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 20e7297..c9cb170 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -40,7 +40,7 @@ <item name="android:windowIsTranslucent">true</item> </style> <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar"> - <item name="android:background">@drawable/bg_browsertabs</item> + <item name="android:background">@drawable/bg_urlbar</item> <item name="android:displayOptions"></item> </style> <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView"> diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index b86759a..23aeed5 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -62,7 +62,6 @@ public class BrowserActivity extends Activity { finish(); return; } - mController = new Controller(this, icicle == null); boolean xlarge = isTablet(this); if (xlarge) { |