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

Commit a43f9d93 authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by Automerger Merge Worker
Browse files

Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0d 

Change-Id: Ifa733f80c0e9d6d22b7bb6179741ec7a56d83f55
parents c2b56ab6 82902c0d

quickstep/recents_ui_overrides/res/drawable/chip_scrim_gradient.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <gradient

        android:angle="90"

        android:endColor="@android:color/transparent"

        android:startColor="@color/chip_scrim_start_color"

        android:type="linear" />

</shape>
 
 No newline at end of file

quickstep/recents_ui_overrides/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<resources>

    <color name="chip_hint_foreground_color">#fff</color>

    <color name="chip_scrim_start_color">#39000000</color>



    <color name="all_apps_label_text">#61000000</color>

    <color name="all_apps_label_text_dark">#61FFFFFF</color>

quickstep/recents_ui_overrides/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    <dimen name="chip_hint_start_padding">10dp</dimen>

    <dimen name="chip_hint_end_padding">12dp</dimen>

    <dimen name="chip_hint_horizontal_margin">20dp</dimen>

    <dimen name="chip_hint_vertical_offset">16dp</dimen>

    <dimen name="chip_hint_elevation">2dp</dimen>

    <dimen name="chip_icon_size">16dp</dimen>

    <dimen name="chip_text_height">26dp</dimen>

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+6 −6
Original line number Diff line number Diff line
@@ -197,15 +197,15 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
            case INDEX_RECENTS_FADE_ANIM:

                return ObjectAnimator.ofFloat(mLauncher.getOverviewPanel(),

                        RecentsView.CONTENT_ALPHA, values);

            case INDEX_RECENTS_TRANSLATE_X_ANIM:

                // TODO: Do not assume motion across X axis for adjacent page

                return new SpringAnimationBuilder<>(

                        mLauncher.getOverviewPanel(), ADJACENT_PAGE_OFFSET)

                        .setMinimumVisibleChange(1f / mLauncher.getOverviewPanel().getWidth())

            case INDEX_RECENTS_TRANSLATE_X_ANIM: {

                RecentsView rv = mLauncher.getOverviewPanel();

                return new SpringAnimationBuilder(mLauncher)

                        .setMinimumVisibleChange(1f / rv.getPageOffsetScale())

                        .setDampingRatio(0.8f)

                        .setStiffness(250)

                        .setValues(values)

                        .build(mLauncher);

                        .build(rv, ADJACENT_PAGE_OFFSET);

            }

            case INDEX_PAUSE_TO_OVERVIEW_ANIM: {

                StateAnimationConfig config = new StateAnimationConfig();

                config.duration = ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AllAppsTipView.java

+0 −4
Original line number Diff line number Diff line
@@ -73,10 +73,6 @@ public class AllAppsTipView { 
        if (!hasSeenAllAppsTip(launcher)) {

            launcher.getStateManager().addStateListener(

                    new LauncherStateManager.StateListener() {

                        @Override

                        public void onStateTransitionStart(LauncherState toState) {

                        }



                        @Override

                        public void onStateTransitionComplete(LauncherState finalState) {

                            if (finalState == ALL_APPS) {