diff options
| author | 2020-03-23 17:54:44 +0000 | |
|---|---|---|
| committer | 2020-03-23 17:54:44 +0000 | |
| commit | 2336c0b0ab7aa7e07d2ea7a8f9cd90a1d0b1432c (patch) | |
| tree | 25d168e9dcd10cc628edd88fb51e9542203021c5 | |
| parent | ad839710bd975c76f28a90125a0dcf7ff2339eed (diff) | |
| parent | 92cdbb60d104fe0cbb23473f0dae6670190a2b0c (diff) | |
Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev am: 8c6b17b1ad am: 9d5d422717 am: 92cdbb60d1
Change-Id: Ice7f401e3f3ea67b2f46b781c610e2d7f7e97700
| -rw-r--r-- | core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java | 2 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_empty_states.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java index a8155928dacc..ae9ce655ff3a 100644 --- a/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java +++ b/core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java @@ -422,8 +422,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { private void showSpinner(View emptyStateView) { emptyStateView.findViewById(R.id.resolver_empty_state_icon).setVisibility(View.INVISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_title).setVisibility(View.INVISIBLE); - emptyStateView.findViewById(R.id.resolver_empty_state_subtitle) - .setVisibility(View.INVISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_button).setVisibility(View.INVISIBLE); emptyStateView.findViewById(R.id.resolver_empty_state_progress).setVisibility(View.VISIBLE); emptyStateView.findViewById(R.id.empty).setVisibility(View.GONE); diff --git a/core/res/res/layout/resolver_empty_states.xml b/core/res/res/layout/resolver_empty_states.xml index 67299e837e8d..af803fcf09cc 100644 --- a/core/res/res/layout/resolver_empty_states.xml +++ b/core/res/res/layout/resolver_empty_states.xml @@ -67,8 +67,10 @@ style="@style/Widget.Material.Light.ProgressBar" android:visibility="gone" android:layout_width="wrap_content" - android:layout_height="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"/> |