2
0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-19 09:25:34 +00:00

[fenix] For https://github.com/mozilla-mobile/fenix/issues/561 - Fixes visual inconsistencies with the search bar

This commit is contained in:
Jeff Boek 2019-09-24 15:12:11 -07:00 committed by Sawyer Blatz
parent 36ae60510f
commit 5c9fc79082
2 changed files with 13 additions and 19 deletions

View File

@ -3,10 +3,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?above"/> <solid android:color="?inset"/>
<stroke android:width="1dp"
android:color="?above"/>
<corners android:radius="8dp"/> <corners android:radius="8dp"/>
</shape> </shape>

View File

@ -65,8 +65,9 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bottom_bar" android:id="@+id/bottom_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="wrap_content"
android:background="?bottomBarBackground" android:background="?bottomBarBackground"
android:paddingBottom="2dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
@ -75,11 +76,8 @@
android:id="@+id/toolbar_wrapper" android:id="@+id/toolbar_wrapper"
android:transitionName="toolbar_wrapper_transition" android:transitionName="toolbar_wrapper_transition"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="40dp"
android:layout_marginStart="8dp" android:layout_margin="8dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp"
android:background="@drawable/home_search_background_normal" android:background="@drawable/home_search_background_normal"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/search_hint" android:contentDescription="@string/search_hint"
@ -93,7 +91,8 @@
android:id="@+id/search_engine_icon" android:id="@+id/search_engine_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_margin="12dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:importantForAccessibility="no" /> android:importantForAccessibility="no" />
@ -103,12 +102,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="47dp" android:layout_marginStart="40dp"
android:clickable="false" android:clickable="false"
android:focusable="false" android:focusable="false"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/search_hint" android:text="@string/search_hint"
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="15sp" /> android:textSize="15sp" />
@ -116,8 +113,8 @@
<ImageButton <ImageButton
android:id="@+id/add_tab_button" android:id="@+id/add_tab_button"
android:layout_width="48dp" android:layout_width="40dp"
android:layout_height="48dp" android:layout_height="40dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/add_tab" android:contentDescription="@string/add_tab"
android:src="@drawable/ic_new" android:src="@drawable/ic_new"
@ -128,9 +125,9 @@
<ImageButton <ImageButton
android:id="@+id/menuButton" android:id="@+id/menuButton"
android:layout_width="@dimen/glyph_button_height" android:layout_width="40dp"
android:layout_height="@dimen/glyph_button_height" android:layout_height="40dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/content_description_menu" android:contentDescription="@string/content_description_menu"
android:src="@drawable/ic_menu" android:src="@drawable/ic_menu"