Implement pseudo 3d overscroll for tab switcher
Bug: 5255100
Change-Id: Id756e36bba2644cc1be1a699f80dbd78119ec56f
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index 885bfd1..ba7ac26 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -20,12 +20,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/browser_background_holo" >
+ <com.android.browser.NavTabScroller
+ android:id="@+id/scroller"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/tabbar"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="44dip"
- android:layout_alignParentBottom="true"
+ android:layout_height="@dimen/toolbar_height"
+ android:layout_gravity="top"
android:gravity="right"
android:background="#C0404040">
<ImageButton
@@ -54,9 +58,4 @@
android:contentDescription="@string/accessibility_button_more"
android:src="@drawable/ic_menu_overflow" />
</LinearLayout>
- <com.android.browser.NavTabGallery
- android:id="@+id/scroller"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_above="@id/tabbar" />
</RelativeLayout>
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml
index 399595e..0cdc931 100644
--- a/res/layout/anim_screen.xml
+++ b/res/layout/anim_screen.xml
@@ -20,13 +20,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:focusable="false">
+ android:focusable="false"
+ android:background="@drawable/browser_background_holo">
<ImageView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height" />
<ImageView
android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/white" />
</LinearLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 0ea332f..ae0db1b 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:background="@drawable/browser_background_holo">
- <com.android.browser.NavTabGallery
+ <com.android.browser.NavTabScroller
android:id="@+id/scroller"
android:layout_width="match_parent"
android:layout_height="match_parent"