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

Commit b2074940 authored by arangelov's avatar arangelov Committed by Antoan Angelov
Browse files

Only change the intent resolver height in tabbed view. 

Fixes: 149489404
Test: manual
Change-Id: Idf801794923f249d58bd1caf4ec34f31179c0dd6
parent c7769999

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

+6 −4
Original line number Diff line number Diff line
@@ -387,10 +387,12 @@ public class ResolverActivity extends Activity implements 
                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);

            rdl.setOnApplyWindowInsetsListener(this::onApplyWindowInsets);



            rdl.setMaxCollapsedHeight(hasWorkProfile() && ENABLE_TABBED_VIEW

                    ? getResources().getDimensionPixelSize(

                            R.dimen.resolver_empty_state_height_with_tabs)

                    : getResources().getDimensionPixelSize(R.dimen.resolver_empty_state_height));

            if (hasWorkProfile() && ENABLE_TABBED_VIEW) {

                rdl.setMaxCollapsedHeight(getResources().getDimensionPixelSize(

                        R.dimen.resolver_empty_state_height_with_tabs));

                findViewById(R.id.profile_pager).setMinimumHeight(

                        getResources().getDimensionPixelSize(R.dimen.resolver_empty_state_height));

            }



            mResolverDrawerLayout = rdl;

        }

core/res/res/layout/resolver_list.xml

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

    android:layout_height="match_parent"

    android:maxWidth="@dimen/resolver_max_width"

    android:maxCollapsedHeight="@dimen/resolver_empty_state_height"

    android:maxCollapsedHeight="192dp"

    android:maxCollapsedHeightSmall="56dp"

    android:id="@id/contentPanel">
@@ -102,7 +102,6 @@ 
                    android:id="@+id/profile_pager"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:minHeight="@dimen/resolver_empty_state_height"

                    android:divider="?attr/dividerVertical"

                    android:footerDividersEnabled="false"

                    android:headerDividersEnabled="false"

core/res/res/layout/resolver_list_with_default.xml

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ 
                    android:id="@+id/profile_pager"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:minHeight="@dimen/resolver_empty_state_height"

                    android:dividerHeight="1dp"

                    android:divider="?attr/dividerVertical"

                    android:footerDividersEnabled="false"