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

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

Snap for 9088299 from 4ef5056b to tm-qpr1-release 

Change-Id: I4b8d2eebf492c6168da86eb9c3eaae50c61230d2
parents 96bd5cf4 4ef5056b

quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java

+9 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.DeviceProfile.DeviceProfileListenable;

import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.FloatingHeaderRow;

import com.android.launcher3.allapps.FloatingHeaderView;

import com.android.launcher3.anim.AlphaUpdateListener;
@@ -117,9 +118,14 @@ public class PredictionRowView<T extends Context & ActivityContext & DeviceProfi 


    @Override

    public int getExpectedHeight() {

        return getVisibility() == GONE ? 0

                : mActivityContext.getDeviceProfile().allAppsCellHeightPx + getPaddingTop()

                        + getPaddingBottom();

        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();

        int iconHeight = deviceProfile.allAppsIconSizePx;

        int iconPadding = deviceProfile.allAppsIconDrawablePaddingPx;

        int textHeight = Utilities.calculateTextHeight(deviceProfile.allAppsIconTextSizePx);

        int verticalPadding = getResources().getDimensionPixelSize(

                R.dimen.all_apps_predicted_icon_vertical_padding);

        int totalHeight = iconHeight + iconPadding + textHeight + verticalPadding * 2;

        return getVisibility() == GONE ? 0 : totalHeight + getPaddingTop() + getPaddingBottom();

    }



    @Override

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+8 −1
Original line number Diff line number Diff line
@@ -1140,6 +1140,13 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            boolean isCancel) {

        long duration = MAX_SWIPE_DURATION;

        float currentShift = mCurrentShift.value;

        boolean recentsVisible = mRecentsView != null

                && (mRecentsView.getWindowVisibility() == View.VISIBLE);

        if (!recentsVisible) {

            // We've hit a case where Launcher is been stopped mid-gesture, in this case, force

            // a LAST_TASK end target

            isCancel = true;

        }

        final GestureEndTarget endTarget = calculateEndTarget(velocity, endVelocity,

                isFling, isCancel);

        // Set the state, but don't notify until the animation completes
@@ -1219,7 +1226,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


        // Let RecentsView handle the scrolling to the task, which we launch in startNewTask()

        // or resumeLastTask().

        if (mRecentsView != null) {

        if (recentsVisible) {

            ActiveGestureLog.INSTANCE.trackEvent(ActiveGestureErrorDetector.GestureEvent

                    .SET_ON_PAGE_TRANSITION_END_CALLBACK);

            mRecentsView.setOnPageTransitionEndCallback(

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
    protected void onPageEndTransition() {

        super.onPageEndTransition();

        ActiveGestureLog.INSTANCE.addLog(

                "onPageEndTransition: current page index updated", mCurrentPage);

                "onPageEndTransition: current page index updated", getNextPage());

        if (isClearAllHidden() && !mActivity.getDeviceProfile().isTablet) {

            mActionsView.updateDisabledFlags(OverviewActionsView.DISABLED_SCROLLING, false);

        }

res/layout/all_apps_personal_work_tabs.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_gravity="center_horizontal"

    android:paddingTop="@dimen/all_apps_tabs_vertical_padding"

    android:paddingBottom="@dimen/all_apps_tabs_vertical_padding"

    android:layout_marginTop="@dimen/all_apps_tabs_margin_top"

    android:orientation="horizontal"

    style="@style/TextHeadline">

res/values-ky/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
    <string name="msg_no_phone_permission" msgid="9208659281529857371">"<xliff:g id="APP_NAME">%1$s</xliff:g> телефон чалууларды аткарууга уруксаты жок"</string>

    <string name="gadget_error_text" msgid="740356548025791839">"Виджет жүктөлбөй жатат"</string>

    <string name="gadget_setup_text" msgid="8348374825537681407">"Виджеттин жөндөөлөрү"</string>

    <string name="gadget_complete_setup_text" msgid="309040266978007925">"Жөндөп бүтүү үчүн таптап коюңуз"</string>

    <string name="gadget_complete_setup_text" msgid="309040266978007925">"Аягына чейин тууралоо үчүн басып коюңуз"</string>

    <string name="uninstall_system_app_text" msgid="4172046090762920660">"Бул системдик колдонмо жана аны чечкенге болбойт."</string>

    <string name="folder_hint_text" msgid="5174843001373488816">"Аталышын түзөтүү"</string>

    <string name="disabled_app_label" msgid="6673129024321402780">"<xliff:g id="APP_NAME">%1$s</xliff:g> өчүрүлгөн"</string>