diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 12:40:10 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 12:40:10 -0400 |
| commit | 799fccd2479184178e13c3342d3051b997893793 (patch) | |
| tree | 0e4c613a119c6bc3fd4e97beb07c4b9ae1fc9f4f | |
| parent | d95fb21110c4787a9a37c1616ab8490020ceb531 (diff) | |
| parent | 429faf26e6aa6f901e803434e08739bc3629e2b5 (diff) | |
| download | packages_apps_Browser-799fccd2479184178e13c3342d3051b997893793.tar.gz packages_apps_Browser-799fccd2479184178e13c3342d3051b997893793.tar.bz2 packages_apps_Browser-799fccd2479184178e13c3342d3051b997893793.zip | |
Merge change 25402 into eclair
* changes:
Remove the extra padding in the Tabs.
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | res/layout/tabs.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 | ||||
| -rw-r--r-- | src/com/android/browser/CombinedBookmarkHistoryActivity.java | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d25a2ac8e..f6f5a22b8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -113,7 +113,8 @@ </activity> <activity android:name="CombinedBookmarkHistoryActivity" android:label="" - android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden"> + android:launchMode="singleTop" android:configChanges="orientation|keyboardHidden" + android:theme="@style/BookmarkTheme" > </activity> <activity android:name="BrowserBookmarksPage" android:label="@string/bookmarks" diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml index 9d25eb166..759e0c79c 100644 --- a/res/layout/tabs.xml +++ b/res/layout/tabs.xml @@ -26,9 +26,6 @@ <TabWidget android:id="@android:id/tabs" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingLeft="1dip" - android:paddingRight="1dip" - android:paddingTop="4dip" /> <FrameLayout android:id="@android:id/tabcontent" diff --git a/res/values/styles.xml b/res/values/styles.xml index c9ee56b9d..89d5a04ad 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,6 +26,10 @@ <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextView</item> </style> + <style name="BookmarkTheme" parent="@android:Theme.Black"> + <item name="android:windowNoTitle">true</item> + </style> + <style name="AutoCompleteTextView"> <item name="android:focusable">true</item> <item name="android:focusableInTouchMode">true</item> diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java index c08608de4..816731a87 100644 --- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java +++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java @@ -78,7 +78,6 @@ public class CombinedBookmarkHistoryActivity extends TabActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.tabs); getTabHost().setOnTabChangedListener(this); |