diff options
| author | John Reck <jreck@google.com> | 2011-08-10 15:53:07 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-08-11 10:29:45 -0700 |
| commit | 2d963a2899afbe000d1ab498f94de87f25e33184 (patch) | |
| tree | 12c78e12a35dd5de8b0673768f25e8fb688d6dfd /res | |
| parent | e3da7d615be4710da92a79e6ed70dc1982deda4c (diff) | |
| download | packages_apps_browser-2d963a2899afbe000d1ab498f94de87f25e33184.zip packages_apps_browser-2d963a2899afbe000d1ab498f94de87f25e33184.tar.gz packages_apps_browser-2d963a2899afbe000d1ab498f94de87f25e33184.tar.bz2 | |
Support horizontal swipe in combo activity
Bug: 5145315
Change-Id: I1e9b4a6bae325244c7a3fb6159deadc3fcf170e6
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/bookmarks.xml | 44 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 2 |
2 files changed, 16 insertions, 30 deletions
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml index e02e2ff..09b442e 100644 --- a/res/layout/bookmarks.xml +++ b/res/layout/bookmarks.xml @@ -14,39 +14,25 @@ limitations under the License. --> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/bookmarks" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:paddingTop="@dimen/combo_paddingTop"> - - <FrameLayout - android:id="@+id/header_container" + <com.android.browser.view.BookmarkExpandableView + android:id="@+id/grid" android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:childDivider="@android:color/transparent" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" /> + <TextView + android:id="@android:id/empty" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="@string/empty_bookmarks_folder" android:visibility="gone" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - <com.android.browser.view.BookmarkExpandableView - android:id="@+id/grid" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_horizontal" - android:childDivider="@android:color/transparent" - android:divider="@android:color/transparent" - android:dividerHeight="0dp" /> - <TextView - android:id="@android:id/empty" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/empty_bookmarks_folder" - android:visibility="gone" /> - </FrameLayout> - -</LinearLayout> +</FrameLayout> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 8fca68a..f1f9217 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -54,7 +54,7 @@ <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_paddingTop">0dip</dimen> <dimen name="combo_horizontalSpacing">6dip</dimen> <dimen name="tab_view_thumbnail_height">76dip</dimen> <!-- Preference activity side margins --> |