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

Commit 158549ab authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Fixes 'capture more' on Settings home page" into main

parents e2984b4b f5aa74b0

aconfig/settings_flag_declarations.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -80,3 +80,13 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "extended_screenshots_exclude_nested_scrollables"

  namespace: "systemui"

  description: "Sets a flag on the main scrollable container to exclude any nested scrollable views as potential targets for extended screenshots."

  bug: "399810823"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

src/com/android/settings/homepage/SettingsHomepageActivity.java

+10 −0
Original line number Diff line number Diff line
@@ -778,6 +778,16 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
        // Prevent inner RecyclerView gets focus and invokes scrolling.

        view.setFocusableInTouchMode(true);

        view.requestFocus();



        if (Flags.extendedScreenshotsExcludeNestedScrollables()) {

            // Force scroll capture to select the NestedScrollView, instead of the non-scrollable

            // RecyclerView which is contained inside it with no height constraint.

            final View scrollableContainer = findViewById(R.id.main_content_scrollable_container);

            if (scrollableContainer != null) {

                scrollableContainer.setScrollCaptureHint(

                        View.SCROLL_CAPTURE_HINT_EXCLUDE_DESCENDANTS);

            }

        }

    }



    private void updateHomepageAppBar() {