Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55007c4e authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Center the work tab empty state spinner inside the empty state view."... 

Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev am: 8c6b17b1

Change-Id: I9428292e142d3b99a8f14237bb92ab86abb240d7
parents 5d692283 8c6b17b1

core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

core/res/res/layout/resolver_empty_states.xml

+3 −1
Original line number Diff line number Diff line
@@ -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"/>