Settings: integrate avatar inside A15-revamp search bar

**trying to copy scamsung xD

Signed-off-by: drkphnx <[email protected]>

Author: drkphnx

res/layout/search_bar_unified_version.xml

@@ -17,37 +17,61 @@
 
 <com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/SearchBarStyle_v2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/search_action_bar"
-        android:layout_width="match_parent"
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/search_action_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="72dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:gravity="center_vertical"
+    android:focusedByDefault="true"
+    android:background="@drawable/search_bar_selected_background_v2">
+
+    <!-- Search Icon -->
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_homepage_search"
+        android:tint="@color/top_level_preference_text_color_primary"
+        android:importantForAccessibility="no"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <!-- Search Text -->
+    <TextView
+        android:id="@+id/search_bar_title"
+        style="@style/TextAppearance.SearchBar"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="72dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:focusedByDefault="true"
-        android:background="@drawable/search_bar_selected_background_v2">
-
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_homepage_search"
-            android:tint="@color/top_level_preference_text_color_primary" />
-        <TextView
-            android:id="@+id/search_bar_title"
-            style="@style/TextAppearance.SearchBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:paddingEnd="8dp"
-            android:text="@string/search_settings"
-            android:textColor="@color/top_level_preference_text_color_primary"/>
-    </LinearLayout>
+        android:layout_marginStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/search_settings"
+        android:textColor="@color/top_level_preference_text_color_primary"
+        app:layout_constraintStart_toEndOf="@id/imageView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/account_avatar"/>
+
+    <!-- Avatar aligned to end -->
+    <ImageView
+        android:id="@+id/account_avatar"
+        android:layout_width="@dimen/custom_avatar_length"
+        android:layout_height="@dimen/custom_avatar_length"
+        android:layout_marginStart="8dp"
+    	android:layout_marginEnd="-16dp"
+        android:visibility="invisible"
+        android:contentDescription="@string/search_bar_account_avatar_content_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>

res/values/dimens.xml

@@ -17,6 +17,8 @@
 <resources>
     <dimen name="match_parent">-1px</dimen>
 
+    <dimen name="custom_avatar_length">60dp</dimen>
+
     <dimen name="app_icon_size">40dip</dimen>
     <dimen name="min_tap_target_size">48dp</dimen>
     <dimen name="screen_margin_sides">64dip</dimen>