diff options
Diffstat (limited to 'java/com/android/dialer/main/impl')
5 files changed, 11 insertions, 9 deletions
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml index 921171fd4..59c653712 100644 --- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml +++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml @@ -30,9 +30,9 @@ <ImageView android:id="@+id/bottom_nav_item_image" - android:layout_width="28dp" - android:layout_height="28dp" - android:layout_marginBottom="2dp" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginBottom="8dp" android:layout_marginTop="6dp"/> <TextView @@ -60,6 +60,6 @@ android:layout_height="wrap_content" android:layout_marginBottom="6dp" android:gravity="center_horizontal" - android:textSize="15sp" + android:textSize="14sp" style="@style/Dialer.TextAppearance.OVERLINE"/> </com.android.dialer.main.impl.bottomnav.BottomNavItem> diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml index 25db63773..8ab666741 100644 --- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml +++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml @@ -62,7 +62,7 @@ android:layout_gravity="end|bottom" android:src="@drawable/quantum_ic_dialpad_white_24" android:contentDescription="@string/dialpad_button_content_description" - app:backgroundTint="?android:attr/colorAccent"/> + app:backgroundTint="@color/dialer_theme_color"/> <include android:id="@+id/promotion_bottom_sheet" layout="@layout/promotion_bottom_sheet"/> diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java index 60b067379..1c326d16a 100644 --- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java +++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java @@ -187,11 +187,12 @@ final class SearchBarView extends FrameLayout { */ private void setMargins(float fraction) { int margin = (int) (this.margin * fraction); + int sideMargin = (int) (this.margin * 2f); MarginLayoutParams params = (MarginLayoutParams) getLayoutParams(); params.topMargin = margin; params.bottomMargin = margin; - params.leftMargin = margin; - params.rightMargin = margin; + params.leftMargin = sideMargin; + params.rightMargin = sideMargin; searchBoxExpanded.getLayoutParams().height = (int) (animationEndHeight - (animationEndHeight - animationStartHeight) * fraction); } diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml index d46e406d6..7a366fa57 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml @@ -27,7 +27,8 @@ android:id="@+id/search_view_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/search_bar_margin" + android:layout_marginVertical="8dp" + android:layout_marginHorizontal="16dp" android:background="@drawable/search_bar_background_rounded_corners" android:minHeight="@dimen/collapsed_search_bar_height"> diff --git a/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml b/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml index ed6f197fa..cdb154c56 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/values/dimens.xml @@ -19,4 +19,4 @@ <dimen name="collapsed_search_bar_height">48dp</dimen> <!-- collapsed + margin * 2 --> <dimen name="expanded_search_bar_height">64dp</dimen> -</resources>
\ No newline at end of file +</resources> |