AB-772-1 merging large-v17 styles

mozilla-release/mobile/android/app/src/main/res/values-large-v17/styles.xml

@@ -16,7 +16,7 @@
     <style name="UrlBar.MenuItem" parent="UrlBar.V17.MenuItem" />
 
     <style name="UrlBar.V17.MenuItem" parent="UrlBar.Base.MenuItem">
-        <item name="android:layout_toStartOf">@id/tabs</item>
+        <item name="android:layout_toStartOf">@id/ghosty</item>
     </style>
 
     <style name="UrlBar.Tabs" parent="UrlBar.V17.Tabs" />
@@ -45,8 +45,11 @@
 
     <style name="UrlBar.V17.ForwardButton" parent="UrlBar.Base.ForwardButton">
         <item name="android:layout_toEndOf">@id/back</item>
+        <!-- Cliqz start +->
+        remove not needed padding
         <item name="android:paddingStart">@dimen/tablet_fwd_button_padding_start</item>
         <item name="android:paddingEnd">@dimen/tablet_fwd_button_padding_end</item>
+        <!+- Cliqz end -->
     </style>
 
     <style name="UrlBar.BackButton" parent="UrlBar.V17.BackButton" />
@@ -66,6 +69,10 @@
     <style name="UrlBar.EditLayout.Title" parent="UrlBar.V17.EditLayout.Title"/>
     <style name="UrlBar.V17.EditLayout.Title" parent="UrlBar.Title">
         <item name="android:paddingEnd">8dp</item>
+        <!-- Cliqz start -->
+        <!-- add padding at start to the urlBar edit text-->
+        <item name="android:paddingStart">@dimen/padding_10</item>
+        <!-- Cliqz end -->
     </style>
 
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V17.DisplayLayout" />
@@ -90,12 +97,18 @@
     <style name="UrlBar.SiteIdentity" parent="UrlBar.V17.SiteIdentity" />
 
     <style name="UrlBar.V17.SiteIdentity" parent="UrlBar.Base.SiteIdentity">
-        <item name="android:paddingStart">3dp</item>
+        <!-- Cliqz start -->
+        <item name="android:paddingStart">@dimen/browser_toolbar_site_security_margin_start</item>
+        <!-- Cliqz end -->
         <item name="android:paddingEnd">@dimen/browser_toolbar_site_security_margin_end</item>
     </style>
 
     <style name="TabsTray.AddTab" parent="TabsTray.V17.AddTab"/>
-    <style name="TabsTray.V17.AddTab" parent="TabsTray.Base.AddTab"/>
+    <style name="TabsTray.V17.AddTab" parent="TabsTray.Base.AddTab">
+    <!-- Cliqz start -->
+    <item name="android:layout_marginLeft">@dimen/padding_10</item>
+    </style>
+    <!-- Cliqz end -->
 
     <style name="TabsTray.Menu" parent="TabsTray.V17.Menu"/>
     <style name="TabsTray.V17.Menu" parent="TabsTray.Base.Menu">