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

Commit 24e10b9d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11945538 from 7994cff8 to 24Q3-release

Change-Id: I28ab8795fa50f51f5658f9c70a07fbfe9b457997
parents 32da275b 7994cff8
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@
        android:id="@+id/split_instructions_text"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:maxWidth="@dimen/split_instructions_view_max_width"
        android:textColor="?androidprv:attr/textColorOnAccent"
        android:text="@string/toast_split_select_app" />

@@ -36,6 +37,7 @@
        android:id="@+id/split_instructions_text_cancel"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:layout_gravity="center_vertical"
        android:textColor="?androidprv:attr/textColorOnAccent"
        android:layout_marginStart="@dimen/split_instructions_start_margin_cancel"
        android:text="@string/toast_split_select_app_cancel"
+4 −0
Original line number Diff line number Diff line
@@ -45,4 +45,8 @@
    <dimen name="allset_page_allset_text_size">38sp</dimen>
    <dimen name="allset_page_swipe_up_text_size">15sp</dimen>

    <!-- Splitscreen -->
    <!-- Max width of the split instructions view -->
    <dimen name="split_instructions_view_max_width">300dp</dimen>

</resources>
+4 −0
Original line number Diff line number Diff line
@@ -490,4 +490,8 @@
    <!-- Digital Wellbeing -->
    <dimen name="digital_wellbeing_toast_height">48dp</dimen>

    <!-- Splitscreen -->
    <!-- Max width of the split instructions view -->
    <dimen name="split_instructions_view_max_width">220dp</dimen>

</resources>
+2 −0
Original line number Diff line number Diff line
@@ -337,6 +337,8 @@ public class AlphabeticalAppsList<T extends Context & ActivityContext> implement
                && !mPrivateApps.isEmpty()) {
            // Always add PS Header if Space is present and visible.
            position = mPrivateProviderManager.addPrivateSpaceHeader(mAdapterItems);
            mFastScrollerSections.add(new FastScrollSectionInfo(
                    mPrivateProfileAppScrollerBadge, position));
            int privateSpaceState = mPrivateProviderManager.getCurrentState();
            switch (privateSpaceState) {
                case PrivateProfileManager.STATE_DISABLED:
+16 −1
Original line number Diff line number Diff line
@@ -242,11 +242,26 @@ public class FolderAnimationManager {
        // Create reveal animator for the folder content (capture the top 4 icons 2x2)
        int width = mDeviceProfile.folderCellLayoutBorderSpacePx.x
                + mDeviceProfile.folderCellWidthPx * 2;
        int rtlExtraWidth = 0;
        int height = mDeviceProfile.folderCellLayoutBorderSpacePx.y
                + mDeviceProfile.folderCellHeightPx * 2;
        int page = mIsOpening ? mContent.getCurrentPage() : mContent.getDestinationPage();
        // In RTL we want to move to the last 2 columns of icons in the folder.
        if (Utilities.isRtl(mContext.getResources())) {
            page = (mContent.getPageCount() - 1) - page;
            CellLayout clAtPage = mContent.getPageAt(page);
            if (clAtPage != null) {
                int numExtraRows = clAtPage.getCountX() - 2;
                rtlExtraWidth = (int) Math.max(numExtraRows * (mDeviceProfile.folderCellWidthPx
                        + mDeviceProfile.folderCellLayoutBorderSpacePx.x), rtlExtraWidth);
            }
        }
        int left = mContent.getPaddingLeft() + page * lp.width;
        Rect contentStart = new Rect(left, 0, left + width, height);
        Rect contentStart = new Rect(
                left + rtlExtraWidth,
                0,
                left + width + mContent.getPaddingRight() + rtlExtraWidth,
                height);
        Rect contentEnd = new Rect(left, 0, left + lp.width, lp.height);
        play(a, shapeDelegate.createRevealAnimator(
                mFolder.getContent(), contentStart, contentEnd, finalRadius, !mIsOpening));
Loading