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

Commit d9d2acf9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Increase collapsed height for resolver list with default and tabs" into... 

Merge "Increase collapsed height for resolver list with default and tabs" into rvc-dev am: 42987638

Change-Id: Ia4eaa09758feb8d3ac940926469c0579c563be65
parents 445c5ff7 42987638

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

+9 −5
Original line number Diff line number Diff line
@@ -398,11 +398,6 @@ public class ResolverActivity extends Activity implements 
                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);

            rdl.setOnApplyWindowInsetsListener(this::onApplyWindowInsets);



            if (shouldShowTabs() && isIntentPicker()) {

                rdl.setMaxCollapsedHeight(getResources()

                        .getDimensionPixelSize(R.dimen.resolver_max_collapsed_height_with_tabs));

            }



            mResolverDrawerLayout = rdl;

        }
@@ -1012,6 +1007,15 @@ public class ResolverActivity extends Activity implements 
    protected void onListRebuilt(ResolverListAdapter listAdapter) {

        final ItemClickListener listener = new ItemClickListener();

        setupAdapterListView((ListView) mMultiProfilePagerAdapter.getActiveAdapterView(), listener);

        if (shouldShowTabs() && isIntentPicker()) {

            final ResolverDrawerLayout rdl = findViewById(R.id.contentPanel);

            if (rdl != null) {

                rdl.setMaxCollapsedHeight(getResources()

                        .getDimensionPixelSize(useLayoutWithDefault()

                                ? R.dimen.resolver_max_collapsed_height_with_default_with_tabs

                                : R.dimen.resolver_max_collapsed_height_with_tabs));

            }

        }

    }



    protected boolean onTargetSelected(TargetInfo target, boolean alwaysCheck) {

core/res/res/layout/resolver_list_with_default.xml

+1 −1
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="144dp"

    android:maxCollapsedHeight="@dimen/resolver_max_collapsed_height_with_default"

    android:id="@id/contentPanel">



    <LinearLayout

core/res/res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -822,7 +822,9 @@ 
    <dimen name="resolver_empty_state_height">212dp</dimen>

    <dimen name="resolver_empty_state_height_with_tabs">268dp</dimen>

    <dimen name="resolver_max_collapsed_height">192dp</dimen>

    <dimen name="resolver_max_collapsed_height_with_tabs">248dp</dimen>

    <dimen name="resolver_max_collapsed_height_with_tabs">268dp</dimen>

    <dimen name="resolver_max_collapsed_height_with_default">144dp</dimen>

    <dimen name="resolver_max_collapsed_height_with_default_with_tabs">300dp</dimen>

    <dimen name="resolver_tab_text_size">14sp</dimen>



    <dimen name="chooser_action_button_icon_size">18dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3939,6 +3939,7 @@ 
  <java-symbol type="dimen" name="resolver_empty_state_height" />

  <java-symbol type="dimen" name="resolver_empty_state_height_with_tabs" />

  <java-symbol type="dimen" name="resolver_max_collapsed_height_with_tabs" />

  <java-symbol type="dimen" name="resolver_max_collapsed_height_with_default_with_tabs" />

  <java-symbol type="bool" name="resolver_landscape_phone" />

  <java-symbol type="dimen" name="resolver_tab_text_size" />