diff options
| -rw-r--r-- | res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png | bin | 0 -> 303 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png | bin | 0 -> 304 bytes | |||
| -rw-r--r-- | res/values-xlarge/styles.xml | 63 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 7 | ||||
| -rw-r--r-- | res/values/styles.xml | 48 | ||||
| -rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryView.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/PhoneUi.java | 6 |
7 files changed, 49 insertions, 77 deletions
diff --git a/res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png b/res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png Binary files differnew file mode 100644 index 000000000..99838907a --- /dev/null +++ b/res/drawable-hdpi/bookmarks_widget_thumb_selector_focused.9.png diff --git a/res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png b/res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png Binary files differnew file mode 100644 index 000000000..34704efdc --- /dev/null +++ b/res/drawable-hdpi/bookmarks_widget_thumb_selector_longpressed.9.png diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml deleted file mode 100644 index 473b17009..000000000 --- a/res/values-xlarge/styles.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * - * Copyright 2006,2007,2008 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. - */ ---> - -<resources> - <style name="BrowserTheme" parent="@android:Theme.Holo"> - <item name="android:windowBackground">@color/white</item> - <item name="android:colorBackground">#FFFFFFFF</item> - <item name="android:windowActionBar">true</item> - <item name="android:windowNoTitle">false</item> - <item name="android:actionBarStyle">@style/ActionBarStyle</item> - <item name="android:actionButtonStyle">@style/ActionButton</item> - </style> - <style name="Dialog" parent="@android:style/Theme.Holo.Dialog" > - <item name="android:windowActionBar">false</item> - </style> - <style name="BookmarkTheme" parent="@android:Theme.Holo"> - <item name="android:windowActionBar">false</item> - <item name="android:windowNoTitle">true</item> - <item name="android:colorBackgroundCacheHint">@null</item> - <item name="android:windowFrame">@null</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowIsFloating">true</item> - <item name="android:backgroundDimEnabled">false</item> - <item name="android:windowIsTranslucent">true</item> - </style> - <style name="ShortCutTheme" parent="@android:Theme.Holo"> - </style> - <style name="ActionBarStyle"> - <item name="android:height">56dip</item> - <item name="android:background">@drawable/bg_browsertabs</item> - <item name="android:displayOptions"></item> - </style> - <style name="ActionButton"> - <item name="android:background">?android:attr/selectableItemBackground</item> - </style> - <style name="Suggestions" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView"> - </style> - <style name="SuggestionLineMedium" - parent="@android:style/TextAppearance.Holo.Medium.Inverse"> - <item name="android:textSize">16sp</item> - </style> - <style name="SuggestionLineSmall" - parent="@android:style/TextAppearance.Holo.Small.Inverse"> - <item name="android:textSize">12sp</item> - </style> -</resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 277cb41d4..be5bd24ac 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -44,4 +44,11 @@ <dimen name="list_favicon_corner_radius">3dip</dimen> <dimen name="tab_favicon_corner_radius">2dip</dimen> <dimen name="dropdown_offset">8dip</dimen> + <dimen name="widgetThumbnailHeight">104dip</dimen> + <dimen name="widgetHorizontalSpacing">14dip</dimen> + <dimen name="widgetVerticalSpacing">12dip</dimen> + <!-- For the combined Bookmarks History view --> + <dimen name="combo_paddingTop">10dip</dimen> + <dimen name="combo_paddingLeftRight">16dip</dimen> + <dimen name="combo_horizontalSpacing">8dip</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index a4a27cc25..06c7b32bb 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,20 +18,48 @@ */ --> <resources> - <style name="BrowserTheme" parent="@android:Theme.Black"> + <style name="BrowserTheme" parent="@android:Theme.Holo"> + <item name="android:windowBackground">@color/white</item> + <item name="android:colorBackground">#FFFFFFFF</item> + <item name="android:windowActionBar">true</item> + <item name="android:windowNoTitle">false</item> + <item name="android:actionBarStyle">@style/ActionBarStyle</item> + <item name="android:actionButtonStyle">@style/ActionButton</item> + </style> + <style name="Dialog" parent="@android:style/Theme.Holo.Dialog" > + <item name="android:windowActionBar">false</item> + </style> + <style name="BookmarkTheme" parent="@android:Theme.Holo"> + <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> + <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowFrame">@null</item> <item name="android:windowContentOverlay">@null</item> + <item name="android:windowIsFloating">true</item> + <item name="android:backgroundDimEnabled">false</item> + <item name="android:windowIsTranslucent">true</item> </style> - <style name="Dialog" parent="@android:style/Theme.Dialog"> - <item name="android:background">@color/black</item> + <style name="ActionBarStyle"> + <item name="android:height">56dip</item> + <item name="android:background">@drawable/bg_browsertabs</item> + <item name="android:displayOptions"></item> + </style> + <style name="ActionButton"> + <item name="android:background">?android:attr/selectableItemBackground</item> + </style> + <style name="Suggestions" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView"> + </style> + <style name="SuggestionLineMedium" + parent="@android:style/TextAppearance.Holo.Medium.Inverse"> + <item name="android:textSize">16sp</item> + </style> + <style name="SuggestionLineSmall" + parent="@android:style/TextAppearance.Holo.Small.Inverse"> + <item name="android:textSize">12sp</item> </style> <style name="ActionBar" parent="@android:style/Widget.ActionBar"> <item name="android:background">@color/black</item> </style> - <style name="BookmarkTheme" parent="@android:Theme.Black"> - <item name="android:windowNoTitle">true</item> - <item name="android:windowContentOverlay">@null</item> - </style> <style name="ShortcutTheme" parent="@android:Theme.Holo.DialogWhenLarge"> <item name="android:windowNoTitle">true</item> <item name="android:windowContentOverlay">@null</item> @@ -56,10 +84,4 @@ <item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textStyle">normal</item> </style> - <style name="Suggestions" parent="@android:style/Widget.AutoCompleteTextView"> - </style> - <style name="SuggestionLineMedium" parent="@android:style/TextAppearance.Medium"> - </style> - <style name="SuggestionLineSmall" parent="@android:style/TextAppearance.Small"> - </style> </resources> diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java index 686e646c0..f1b9e2460 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryView.java +++ b/src/com/android/browser/CombinedBookmarkHistoryView.java @@ -170,7 +170,7 @@ public class CombinedBookmarkHistoryView extends LinearLayout mTabHistory.setTabListener(this); mActionBar.addTab(mTabHistory, FRAGMENT_ID_HISTORY == startingFragment); mActionBar.setCustomView(mBookmarksHeader); - + mActionBar.show(); } @Override diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java index 7463ca5dc..73c1b9998 100644 --- a/src/com/android/browser/PhoneUi.java +++ b/src/com/android/browser/PhoneUi.java @@ -48,7 +48,13 @@ public class PhoneUi extends BaseUi { // mTitleBar will be always be shown in the fully loaded mode on // phone mTitleBar.setProgress(100); + mActivity.getActionBar().hide(); + } + @Override + public void hideComboView() { + super.hideComboView(); + mActivity.getActionBar().hide(); } // webview factory |
