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

Commit ad09ae43 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Only add vertical resolver_list padding if showing tabs." into rvc-dev am: 88a6bcae 

Change-Id: I9f14d2c50932cc98f89dcea5b5a33afc831d1529
parents 322205ff 88a6bcae

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

+5 −0
Original line number Diff line number Diff line
@@ -2447,6 +2447,11 @@ public class ChooserActivity extends ResolverActivity implements 
                    offset += findViewById(R.id.tabs).getHeight();

                }



                View tabDivider = findViewById(R.id.resolver_tab_divider);

                if (tabDivider.getVisibility() == View.VISIBLE) {

                    offset += tabDivider.getHeight();

                }



                int directShareHeight = 0;

                rowsToShow = Math.min(4, rowsToShow);

                mLastNumberOfChildren = recyclerView.getChildCount();

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

+2 −2
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ public class ResolverActivity extends Activity implements 


        final DisplayResolveInfo dri =

                mMultiProfilePagerAdapter.getActiveListAdapter().getOtherProfile();

        if (dri != null && !ENABLE_TABBED_VIEW) {

        if (dri != null && !shouldShowTabs()) {

            mProfileView.setVisibility(View.VISIBLE);

            View text = mProfileView.findViewById(R.id.profile_button);

            if (!(text instanceof TextView)) {
@@ -1331,7 +1331,7 @@ public class ResolverActivity extends Activity implements 
        }

        // We partially rebuild the inactive adapter to determine if we should auto launch

        boolean rebuildCompleted = mMultiProfilePagerAdapter.rebuildActiveTab(true);

        if (hasWorkProfile() && ENABLE_TABBED_VIEW) {

        if (shouldShowTabs()) {

            boolean rebuildInactiveCompleted = mMultiProfilePagerAdapter.rebuildInactiveTab(false);

            rebuildCompleted = rebuildCompleted && rebuildInactiveCompleted;

        }

core/res/res/layout/chooser_list_per_profile.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 
<RelativeLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dp"

    android:paddingBottom="8dp">

    android:layout_height="match_parent">

    <com.android.internal.widget.RecyclerView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

core/res/res/layout/resolver_list.xml

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ 
                android:layout_width="match_parent"

                android:layout_height="1dp"

                android:background="?attr/colorBackgroundFloating"

                android:foreground="?attr/dividerVertical" />

                android:foreground="?attr/dividerVertical"

                android:layout_marginBottom="@dimen/resolver_tab_divider_bottom_padding"/>

            <FrameLayout

                android:id="@android:id/tabcontent"

                android:layout_width="match_parent"

core/res/res/layout/resolver_list_per_profile.xml

+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
<RelativeLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="8dp"

    android:paddingBottom="8dp">

    android:layout_height="match_parent">

    <ListView

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"