Merge "Only use padding for the multi-user empty state screens." into rvc-dev

1 files changed, 55 insertions, 51 deletions

diff --git a/core/res/res/layout/resolver_empty_states.xml b/core/res/res/layout/resolver_empty_states.xml
index a41d717a83bd..5890bed11b07 100644
--- a/core/res/res/layout/resolver_empty_states.xml
+++ b/core/res/res/layout/resolver_empty_states.xml
@@ -19,62 +19,66 @@
     android:id="@+id/resolver_empty_state"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:gravity="center_horizontal"
     android:visibility="gone"
-    android:paddingTop="48dp"
-    android:paddingBottom="48dp"
     android:paddingStart="24dp"
     android:paddingEnd="24dp">
-    <ImageView
-        android:id="@+id/resolver_empty_state_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_centerHorizontal="true" />
-    <TextView
-        android:id="@+id/resolver_empty_state_title"
-        android:layout_below="@+id/resolver_empty_state_icon"
-        android:layout_marginTop="8dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="@string/config_headlineFontFamilyMedium"
-        android:textColor="@color/resolver_empty_state_text"
-        android:textSize="14sp"
-        android:layout_centerHorizontal="true" />
-    <TextView
-        android:id="@+id/resolver_empty_state_subtitle"
-        android:layout_below="@+id/resolver_empty_state_title"
-        android:layout_marginTop="4dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/resolver_empty_state_text"
-        android:textSize="12sp"
-        android:gravity="center_horizontal"
-        android:layout_centerHorizontal="true" />
-    <Button
-        android:id="@+id/resolver_empty_state_button"
-        android:layout_below="@+id/resolver_empty_state_subtitle"
-        android:layout_marginTop="16dp"
-        android:text="@string/resolver_switch_on_work"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fontFamily="@string/config_headlineFontFamilyMedium"
-        android:textSize="14sp"
-        android:textColor="?attr/colorAccent"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/resolver_turn_on_work_button_ripple_background"/>
-    <ProgressBar
-        android:id="@+id/resolver_empty_state_progress"
-        style="@style/Widget.Material.Light.ProgressBar"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:indeterminate="true"
-        android:layout_alignTop="@+id/resolver_empty_state_icon"
-        android:layout_alignBottom="@+id/resolver_empty_state_button"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@+id/resolver_empty_state_subtitle"
-        android:indeterminateTint="?attr/colorAccent"/>
+        android:paddingTop="48dp"
+        android:paddingBottom="48dp"
+        android:gravity="center_horizontal">
+        <ImageView
+            android:id="@+id/resolver_empty_state_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_centerHorizontal="true" />
+        <TextView
+            android:id="@+id/resolver_empty_state_title"
+            android:layout_below="@+id/resolver_empty_state_icon"
+            android:layout_marginTop="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@string/config_headlineFontFamilyMedium"
+            android:textColor="@color/resolver_empty_state_text"
+            android:textSize="14sp"
+            android:layout_centerHorizontal="true" />
+        <TextView
+            android:id="@+id/resolver_empty_state_subtitle"
+            android:layout_below="@+id/resolver_empty_state_title"
+            android:layout_marginTop="4dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/resolver_empty_state_text"
+            android:textSize="12sp"
+            android:gravity="center_horizontal"
+            android:layout_centerHorizontal="true" />
+        <Button
+            android:id="@+id/resolver_empty_state_button"
+            android:layout_below="@+id/resolver_empty_state_subtitle"
+            android:layout_marginTop="16dp"
+            android:text="@string/resolver_switch_on_work"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@string/config_headlineFontFamilyMedium"
+            android:textSize="14sp"
+            android:textColor="?attr/colorAccent"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/resolver_turn_on_work_button_ripple_background"/>
+        <ProgressBar
+            android:id="@+id/resolver_empty_state_progress"
+            style="@style/Widget.Material.Light.ProgressBar"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:indeterminate="true"
+            android:layout_alignTop="@+id/resolver_empty_state_icon"
+            android:layout_alignBottom="@+id/resolver_empty_state_button"
+            android:layout_centerHorizontal="true"
+            android:layout_below="@+id/resolver_empty_state_subtitle"
+            android:indeterminateTint="?attr/colorAccent"/>
+    </RelativeLayout>
     <TextView android:id="@+id/empty"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"