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

Commit 1492646b authored by Winson Chung's avatar Winson Chung
Browse files

Adding stack dimming.

- Fixing case where the window scrim was always dark after loading recents with no tasks.
- Restoring rounded task rects and square aspect landscape tasks
parent 9f9679d9
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@
    <integer name="recents_animate_task_bar_enter_duration">200</integer>
    <!-- The animation duration for animating in the info pane. -->
    <integer name="recents_animate_task_view_info_pane_duration">150</integer>
    <!-- The minimum alpha for the dim applied to cards that go deeper into the stack. -->
    <integer name="recents_max_task_stack_view_dim">96</integer>

    <!-- The maximum count of notifications on Keyguard. The rest will be collapsed in an overflow
     card. -->
+3 −0
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@
    <!-- The size of the activity icon in the recents task view. -->
    <dimen name="recents_task_view_activity_icon_size">60dp</dimen>

    <!-- The radius of the rounded corners on a task view. -->
    <dimen name="recents_task_view_rounded_corners_radius">2dp</dimen>

    <!-- The amount of space a user has to scroll to dismiss any info panes. -->
    <dimen name="recents_task_stack_scroll_dismiss_info_pane_distance">50dp</dimen>

+6 −0
Original line number Diff line number Diff line
@@ -93,6 +93,12 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
        } else {
            mEmptyView.setVisibility(View.GONE);

            // Un-dim the background
            WindowManager.LayoutParams wlp = getWindow().getAttributes();
            wlp.dimAmount = 0f;
            getWindow().setAttributes(wlp);
            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
        }
    }

+5 −0
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ public class RecentsConfiguration {
    public int filteringNewViewsMinAnimDuration;
    public int taskBarEnterAnimDuration;
    public int taskStackScrollDismissInfoPaneDistance;
    public int taskStackMaxDim;
    public int taskViewInfoPaneAnimDuration;
    public int taskViewRoundedCornerRadiusPx;

    public boolean launchedWithThumbnailAnimation;

@@ -85,8 +87,11 @@ public class RecentsConfiguration {
                res.getInteger(R.integer.recents_animate_task_bar_enter_duration);
        taskStackScrollDismissInfoPaneDistance = res.getDimensionPixelSize(
                R.dimen.recents_task_stack_scroll_dismiss_info_pane_distance);
        taskStackMaxDim = res.getInteger(R.integer.recents_max_task_stack_view_dim);
        taskViewInfoPaneAnimDuration =
                res.getInteger(R.integer.recents_animate_task_view_info_pane_duration);
        taskViewRoundedCornerRadiusPx =
                res.getDimensionPixelSize(R.dimen.recents_task_view_rounded_corners_radius);
    }

    /** Updates the system insets */
+3 −2
Original line number Diff line number Diff line
@@ -564,8 +564,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
        int minHeight = (int) (mStackRect.height() -
                (Constants.Values.TaskStackView.StackPeekHeightPct * mStackRect.height()));
        int size = Math.min(minHeight, Math.min(mStackRect.width(), mStackRect.height()));
        mTaskRect.set(mStackRect.left, mStackRectSansPeek.top,
                mStackRect.right, mStackRectSansPeek.top + size);
        int left = mStackRect.left + (mStackRect.width() - size) / 2;
        mTaskRect.set(left, mStackRectSansPeek.top,
                left + size, mStackRectSansPeek.top + size);

        // Update the scroll bounds
        updateMinMaxScroll(false);
Loading