summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2014-12-12 19:09:35 +0200
committerSteve Kondik <steve@cyngn.com>2015-11-07 13:57:29 -0800
commitb2dfee221fbf3f8b9d56258f0f43b928912ba8ca (patch)
tree0416d334d7019b82531bb4d0e6a5568392dbeec7
parent95e551d9b4f1f7c45e55f3ca4434786f35a95a14 (diff)
downloadpackages_apps_Browser-b2dfee221fbf3f8b9d56258f0f43b928912ba8ca.tar.gz
packages_apps_Browser-b2dfee221fbf3f8b9d56258f0f43b928912ba8ca.tar.bz2
packages_apps_Browser-b2dfee221fbf3f8b9d56258f0f43b928912ba8ca.zip
Browser: Fix layouts
* Fix crash on screen rotation * Correct indentation * QC tab to primary color Change-Id: I4ee608bd5d2ad33439c723298ed97eed235a3e01
-rw-r--r--res/layout-land/nav_screen.xml20
-rw-r--r--res/layout/nav_screen.xml46
-rw-r--r--res/layout/qc_tab.xml2
3 files changed, 43 insertions, 25 deletions
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index 1af5c4450..fb511db8b 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -31,7 +31,8 @@
android:layout_height="@dimen/toolbar_height"
android:layout_gravity="top"
android:gravity="right"
- android:background="#CC0d0d0d">
+ android:background="#4caf50"
+ android:elevation="8dp">
<ImageButton
android:id="@+id/newtab"
android:layout_width="wrap_content"
@@ -39,6 +40,7 @@
style="@style/HoloButton"
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_newtab"
+ android:visibility="gone"
android:src="@drawable/ic_new_window_dark" />
<ImageButton
android:id="@+id/bookmarks"
@@ -58,4 +60,20 @@
android:contentDescription="@string/accessibility_button_more"
android:src="@drawable/ic_menu_overflow" />
</LinearLayout>
+ <FrameLayout
+ android:id="@+id/floating_action_button_container"
+ android:background="@drawable/fab_accent"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:layout_margin="16dp"
+ android:elevation="4dp"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
+ <ImageButton
+ android:id="@+id/floating_action_button"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:background="@drawable/floating_action_button"
+ android:src="@drawable/ic_new_window_dark"/>
+ </FrameLayout>
</RelativeLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index a6c331a81..a72a1df11 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -35,14 +35,14 @@
android:background="#4caf50"
android:elevation="8dp">
<ImageButton
- android:id="@+id/newtab"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_newtab"
- android:visibility="gone"
- android:src="@drawable/ic_new_window_dark" />
+ android:id="@+id/newtab"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ style="@style/HoloButton"
+ android:gravity="center_vertical"
+ android:contentDescription="@string/accessibility_button_newtab"
+ android:visibility="gone"
+ android:src="@drawable/ic_new_window_dark" />
<ImageButton
android:id="@+id/bookmarks"
android:layout_width="wrap_content"
@@ -62,19 +62,19 @@
android:src="@drawable/ic_menu_overflow" />
</LinearLayout>
<FrameLayout
- android:id="@+id/floating_action_button_container"
- android:background="@drawable/fab_accent"
- android:layout_alignParentRight="true"
- android:layout_alignParentBottom="true"
- android:layout_margin="16dp"
- android:elevation="4dp"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content">
- <ImageButton
- android:id="@+id/floating_action_button"
- android:layout_width="56dp"
- android:layout_height="56dp"
- android:background="@drawable/floating_action_button"
- android:src="@drawable/ic_new_window_dark"/>
- </FrameLayout>
+ android:id="@+id/floating_action_button_container"
+ android:background="@drawable/fab_accent"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:layout_margin="16dp"
+ android:elevation="4dp"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
+ <ImageButton
+ android:id="@+id/floating_action_button"
+ android:layout_width="56dp"
+ android:layout_height="56dp"
+ android:background="@drawable/floating_action_button"
+ android:src="@drawable/ic_new_window_dark"/>
+ </FrameLayout>
</RelativeLayout>
diff --git a/res/layout/qc_tab.xml b/res/layout/qc_tab.xml
index c5e2de26a..74c82a7b5 100644
--- a/res/layout/qc_tab.xml
+++ b/res/layout/qc_tab.xml
@@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@color/black"
+ android:background="@color/primary"
android:padding="0dip"
android:elevation="8dp"
>