Bug 1390256 - Adjust alignment of TabCounter in different styles.xml. r?nechen,walkingice draft
authorJing-wei Wu <topwu.tw@gmail.com>
Wed, 16 Aug 2017 10:20:41 +0800
changeset 648112 a6cfc842f221e95e99526853d10ecec5e592c2c1
parent 648111 4862ac18f89fae3dd2d4c62dbe99a2fd9f3548aa
child 648113 e2edba9e351e5b839918edcc5ddce2ffa1a3864a
push id74628
push userbmo:topwu.tw@gmail.com
push dateThu, 17 Aug 2017 08:32:13 +0000
reviewersnechen, walkingice
bugs1390256
milestone57.0a1
Bug 1390256 - Adjust alignment of TabCounter in different styles.xml. r?nechen,walkingice MozReview-Commit-ID: DrZzqazUmnK
mobile/android/app/src/photon/res/values-large-v17/styles.xml
mobile/android/app/src/photon/res/values-v17/styles.xml
mobile/android/app/src/photon/res/values/styles.xml
--- a/mobile/android/app/src/photon/res/values-large-v17/styles.xml
+++ b/mobile/android/app/src/photon/res/values-large-v17/styles.xml
@@ -25,16 +25,17 @@
         <item name="android:layout_toStartOf">@id/menu</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V17.TabCounter" />
 
     <style name="UrlBar.V17.TabCounter" parent="UrlBar.Base.TabCounter">
         <item name="android:layout_alignStart">@id/tabs</item>
         <item name="android:layout_alignEnd">@id/tabs</item>
+        <item name="android:layout_toStartOf">@id/menu</item>
     </style>
 
     <style name="UrlBar.Entry" parent="UrlBar.V17.Entry" />
 
     <style name="UrlBar.V17.Entry" parent="UrlBar.Base.Entry">
         <item name="android:layout_alignStart">@id/back</item>
         <item name="android:layout_toStartOf">@id/menu_items</item>
         <item name="android:layout_marginStart">@dimen/tablet_nav_button_width_half</item>
--- a/mobile/android/app/src/photon/res/values-v17/styles.xml
+++ b/mobile/android/app/src/photon/res/values-v17/styles.xml
@@ -32,18 +32,19 @@
     <style name="UrlBar.V17.Tabs" parent="UrlBar.Base.Tabs">
         <item name="android:layout_toStartOf">@id/menu</item>
         <item name="android:layout_marginEnd">-4dp</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V17.TabCounter" />
 
     <style name="UrlBar.V17.TabCounter" parent="UrlBar.Base.TabCounter">
-
         <item name="android:layout_alignEnd">@id/tabs</item>
+        <item name="android:layout_alignStart">@id/tabs</item>
+        <item name="android:layout_toStartOf">@id/menu</item>
     </style>
 
     <style name="UrlBar.EditCancel" parent="UrlBar.V17.EditCancel" />
 
     <style name="UrlBar.V17.EditCancel" parent="UrlBar.Base.EditCancel">
         <item name="android:layout_alignParentEnd">true</item>
     </style>
 
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -850,18 +850,19 @@
     <style name="UrlBar.V15.Tabs" parent="UrlBar.Base.Tabs">
         <item name="android:layout_toLeftOf">@id/menu</item>
         <item name="android:layout_marginRight">-4dp</item>
     </style>
 
     <style name="UrlBar.TabCounter" parent="UrlBar.V15.TabCounter"/>
     <style name="UrlBar.Base.TabCounter" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.TabCounter" parent="UrlBar.Base.TabCounter">
-        <item name="android:layout_alignTop">@id/tabs</item>
+        <item name="android:layout_alignLeft">@id/tabs</item>
         <item name="android:layout_alignRight">@id/tabs</item>
+        <item name="android:layout_toLeftOf">@id/menu</item>
     </style>
 
     <style name="UrlBar.EditCancel" parent="UrlBar.V15.EditCancel"/>
     <style name="UrlBar.Base.EditCancel" parent="UrlBar.ImageButton"/>
     <style name="UrlBar.V15.EditCancel" parent="UrlBar.Base.EditCancel">
         <item name="android:layout_alignParentRight">true</item>
     </style>