Bug 1399384 - Part 3: Adjust edit layout padding and move values from layout to different styles.xml. r=nechen
authorJing-wei Wu <topwu.tw@gmail.com>
Wed, 13 Sep 2017 17:25:30 +0800
changeset 430337 33964845834caf5d447d89104c0db3533a03fc56
parent 430336 ccc0121580630db03c096d9bce2664f02ae37ceb
child 430338 8d242a53eca76fca4931aa7e1cbb86402066aeb2
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnechen
bugs1399384
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1399384 - Part 3: Adjust edit layout padding and move values from layout to different styles.xml. r=nechen MozReview-Commit-ID: BgSPLIrMpdT
mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
mobile/android/app/src/photon/res/values-large-v17/styles.xml
mobile/android/app/src/photon/res/values-large/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/layout/toolbar_edit_layout.xml
+++ b/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml
@@ -22,26 +22,24 @@
         android:background="@drawable/url_bar_title_bg"
         android:scaleType="center"
         android:src="@drawable/ic_search_icon"
         android:visibility="gone"
         tools:visibility="visible"/>
 
     <org.mozilla.gecko.toolbar.ToolbarEditText
         android:id="@+id/url_edit_text"
-        style="@style/UrlBar.Title"
+        style="@style/UrlBar.EditLayout.Title"
         android:layout_width="match_parent"
         android:layout_gravity="center_vertical"
         android:layout_weight="1.0"
         android:background="@drawable/url_bar_title_bg"
         android:contentDescription="@string/url_bar_default_text"
         android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
         android:inputType="textUri"
-        android:paddingEnd="8dp"
-        android:paddingRight="8dp"
         android:selectAllOnFocus="true"/>
 
     <org.mozilla.gecko.toolbar.ToolbarRoundButton
         android:id="@+id/qrcode"
         style="@style/UrlBar.QRCode"
         android:background="@drawable/url_bar_action_button"
         android:src="@drawable/ic_qrcode"/>
 
--- a/mobile/android/app/src/photon/res/values-large-v17/styles.xml
+++ b/mobile/android/app/src/photon/res/values-large-v17/styles.xml
@@ -58,16 +58,21 @@
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V17.EditLayout" />
 
     <style name="UrlBar.V17.EditLayout" parent="UrlBar.Base.EditLayout">
         <item name="android:layout_toStartOf">@id/menu_items</item>
         <item name="android:layout_toEndOf">@id/forward</item>
     </style>
 
+    <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>
+    </style>
+
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V17.DisplayLayout" />
 
     <style name="UrlBar.V17.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_toStartOf">@id/menu_items</item>
         <item name="android:layout_toEndOf">@id/forward</item>
     </style>
 
     <style name="UrlBar.EditCancel" parent="UrlBar.V17.EditCancel" />
--- a/mobile/android/app/src/photon/res/values-large/styles.xml
+++ b/mobile/android/app/src/photon/res/values-large/styles.xml
@@ -173,16 +173,21 @@
 
     <style name="UrlBar.Base.EditLayout" parent="UrlBar.Button" />
 
     <style name="UrlBar.V15.EditLayout" parent="UrlBar.Base.EditLayout">
         <item name="android:layout_toLeftOf">@id/menu_items</item>
         <item name="android:layout_toRightOf">@id/forward</item>
     </style>
 
+    <style name="UrlBar.EditLayout.Title" parent="UrlBar.V15.EditLayout.Title"/>
+    <style name="UrlBar.V15.EditLayout.Title" parent="UrlBar.Title">
+        <item name="android:paddingRight">8dp</item>
+    </style>
+
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V15.DisplayLayout" />
 
     <style name="UrlBar.Base.DisplayLayout" parent="UrlBar.Button.Container" />
 
     <style name="UrlBar.V15.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_toLeftOf">@id/menu_items</item>
         <item name="android:layout_toRightOf">@id/forward</item>
     </style>
--- a/mobile/android/app/src/photon/res/values-v17/styles.xml
+++ b/mobile/android/app/src/photon/res/values-v17/styles.xml
@@ -49,21 +49,27 @@
         <item name="android:layout_alignParentEnd">true</item>
     </style>
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V17.EditLayout" />
 
     <style name="UrlBar.V17.EditLayout" parent="UrlBar.Base.EditLayout">
         <item name="android:layout_alignStart">@id/url_bar_entry</item>
         <item name="android:layout_toStartOf">@id/edit_cancel</item>
-        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingStart">5dp</item>
         <item name="android:paddingEnd">0dp</item>
         <item name="android:layout_marginEnd">-3dp</item>
     </style>
 
+    <style name="UrlBar.EditLayout.Title" parent="UrlBar.V17.EditLayout.Title"/>
+    <style name="UrlBar.V17.EditLayout.Title" parent="UrlBar.Title">
+        <item name="android:paddingStart">5dp</item>
+        <item name="android:paddingEnd">8dp</item>
+    </style>
+
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V17.DisplayLayout" />
 
     <style name="UrlBar.V17.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_alignStart">@id/url_bar_entry</item>
         <item name="android:layout_alignEnd">@id/url_bar_entry</item>
     </style>
 
     <style name="UrlBar.QRCode" parent="UrlBar.V17.QRCode"/>
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -894,21 +894,27 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
     <style name="UrlBar.EditLayout" parent="UrlBar.V15.EditLayout"/>
     <style name="UrlBar.Base.EditLayout" parent="UrlBar.Button"/>
     <style name="UrlBar.V15.EditLayout" parent="UrlBar.Base.EditLayout">
         <item name="android:layout_alignLeft">@id/url_bar_entry</item>
         <item name="android:layout_toLeftOf">@id/edit_cancel</item>
-        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingLeft">5dp</item>
         <item name="android:paddingRight">0dp</item>
         <item name="android:layout_marginRight">-3dp</item>
     </style>
 
+    <style name="UrlBar.EditLayout.Title" parent="UrlBar.V15.EditLayout.Title"/>
+    <style name="UrlBar.V15.EditLayout.Title" parent="UrlBar.Title">
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">8dp</item>
+    </style>
+
     <style name="UrlBar.DisplayLayout" parent="UrlBar.V15.DisplayLayout"/>
     <style name="UrlBar.Base.DisplayLayout" parent="UrlBar.Button"/>
 
     <style name="UrlBar.V15.DisplayLayout" parent="UrlBar.Base.DisplayLayout">
         <item name="android:layout_alignLeft">@id/url_bar_entry</item>
         <item name="android:layout_alignRight">@id/url_bar_entry</item>
     </style>