Merge "Fix alignment of title in app bar" into pi-car-dev am: 5cd99c1553
am: 6a8d1a2cc8

Change-Id: Iefc91325aeb441af7834b134a2915ca892fe86ee

res/layout/appbar_view.xml

diff --git a/res/layout/appbar_view.xml b/res/layout/appbar_view.xml
index 232db86..9fee45b 100644
--- a/res/layout/appbar_view.xml
+++ b/res/layout/appbar_view.xml
@@ -102,7 +102,7 @@
     <TextView
         android:id="@+id/title"
         style="@style/AppBarTitleStyle"
-        android:layout_marginStart="@dimen/appbar_view_title_margin_start"
+        app:layout_goneMarginStart="@dimen/appbar_view_title_margin_start"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/row_separator"
         app:layout_constraintStart_toEndOf="@id/nav_icon_container"

res/values/dimens.xml

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 05c05f3..87b0183 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -77,7 +77,7 @@
     <dimen name="appbar_view_tabs_margin_end">@*android:dimen/car_padding_3</dimen>
     <dimen name="appbar_view_control_buttons_spacing">@*android:dimen/car_padding_3</dimen>
     <dimen name="appbar_view_control_buttons_margin_end">@*android:dimen/car_padding_2</dimen>
-    <dimen name="appbar_view_title_margin_start">@*android:dimen/car_padding_2</dimen>
+    <dimen name="appbar_view_title_margin_start">@dimen/appbar_view_nav_button_width</dimen>
 
     <!-- browse_state.xml -->
     <dimen name="browse_state_progress_height">@*android:dimen/car_double_line_list_item_height