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

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

Snap for 8750474 from 3b84c43c to tm-release 

Change-Id: I07fd7244575bdbdffa36d90254a9f21e1baa937f
parents e1e3902e 3b84c43c

core/res/res/values-nb/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -1036,9 +1036,9 @@ 
    <string name="permlab_readHistoryBookmarks" msgid="9102293913842539697">"lese nettbokmerkene og nettloggen din"</string>

    <string name="permdesc_readHistoryBookmarks" msgid="2323799501008967852">"Lar appen lese loggen for alle nettadressene nettleseren har besøkt, og alle bokmerkene i nettleseren. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permlab_writeHistoryBookmarks" msgid="6090259925187986937">"skrive nettbokmerker og nettlogg"</string>

    <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="573341025292489065">"Lar appen endre nettleserens logg eller bokmerker lagret på nettbrettet ditt. Dette kan føre til at appen sletter eller endrer nettleserdata. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="88642768580408561">"Lar appen endre nettleserens logg eller bokmerker som er lagret på Android TV-enheten din. Dette kan føre til at appen sletter eller endrer nettleserdata. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permdesc_writeHistoryBookmarks" product="default" msgid="2245203087160913652">"Lar appen endre nettleserens logg eller bokmerker lagret på telefonen din. Dette kan føre til at appen sletter eller endrer nettleserdata. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="573341025292489065">"Lar appen endre nettleserens logg eller bokmerker lagret på nettbrettet ditt. Dette kan føre til at appen sletter eller endrer nettlesingsdata. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="88642768580408561">"Lar appen endre nettleserens logg eller bokmerker som er lagret på Android TV-enheten din. Dette kan føre til at appen sletter eller endrer nettlesingsdata. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permdesc_writeHistoryBookmarks" product="default" msgid="2245203087160913652">"Lar appen endre nettleserens logg eller bokmerker lagret på telefonen din. Dette kan føre til at appen sletter eller endrer nettlesingsdata. Vær oppmerksom på at denne tillatelsen kanskje ikke benyttes av tredjepartsnettlesere eller andre apper med mulighet for nettsurfing."</string>

    <string name="permlab_setAlarm" msgid="1158001610254173567">"stille alarm"</string>

    <string name="permdesc_setAlarm" msgid="2185033720060109640">"Lar appen stille inn alarmen for en installert alarmklokke-app. Enkelte alarmklokke-apper implementerer kanskje ikke denne funksjonen."</string>

    <string name="permlab_addVoicemail" msgid="4770245808840814471">"legge til talepost"</string>

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java

+5 −3
Original line number Diff line number Diff line
@@ -31,13 +31,15 @@ public interface BackAnimation { 
    /**

     * Called when a {@link MotionEvent} is generated by a back gesture.

     *

     * @param event the original {@link MotionEvent}

     * @param action the original {@link KeyEvent#getAction()} when the event was dispatched to

     * @param touchX the X touch position of the {@link MotionEvent}.

     * @param touchY the Y touch position of the {@link MotionEvent}.

     * @param keyAction the original {@link KeyEvent#getAction()} when the event was dispatched to

     *               the process. This is forwarded separately because the input pipeline may mutate

     *               the {#event} action state later.

     * @param swipeEdge the edge from which the swipe begins.

     */

    void onBackMotion(MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge);

    void onBackMotion(float touchX, float touchY, int keyAction,

            @BackEvent.SwipeEdge int swipeEdge);



    /**

     * Sets whether the back gesture is past the trigger threshold or not.

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+14 −13
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 


        @Override

        public void onBackMotion(

                MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge) {

            mShellExecutor.execute(() -> onMotionEvent(event, action, swipeEdge));

                float touchX, float touchY, int keyAction, @BackEvent.SwipeEdge int swipeEdge) {

            mShellExecutor.execute(() -> onMotionEvent(touchX, touchY, keyAction, swipeEdge));

        }



        @Override
@@ -256,33 +256,34 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
     * Called when a new motion event needs to be transferred to this

     * {@link BackAnimationController}

     */

    public void onMotionEvent(MotionEvent event, int action, @BackEvent.SwipeEdge int swipeEdge) {

    public void onMotionEvent(float touchX, float touchY, int keyAction,

            @BackEvent.SwipeEdge int swipeEdge) {

        if (mTransitionInProgress) {

            return;

        }

        if (action == MotionEvent.ACTION_MOVE) {

        if (keyAction == MotionEvent.ACTION_MOVE) {

            if (!mBackGestureStarted) {

                // Let the animation initialized here to make sure the onPointerDownOutsideFocus

                // could be happened when ACTION_DOWN, it may change the current focus that we

                // would access it when startBackNavigation.

                initAnimation(event);

                initAnimation(touchX, touchY);

            }

            onMove(event, swipeEdge);

        } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {

            onMove(touchX, touchY, swipeEdge);

        } else if (keyAction == MotionEvent.ACTION_UP || keyAction == MotionEvent.ACTION_CANCEL) {

            ProtoLog.d(WM_SHELL_BACK_PREVIEW,

                    "Finishing gesture with event action: %d", action);

                    "Finishing gesture with event action: %d", keyAction);

            onGestureFinished();

        }

    }



    private void initAnimation(MotionEvent event) {

    private void initAnimation(float touchX, float touchY) {

        ProtoLog.d(WM_SHELL_BACK_PREVIEW, "initAnimation mMotionStarted=%b", mBackGestureStarted);

        if (mBackGestureStarted || mBackNavigationInfo != null) {

            Log.e(TAG, "Animation is being initialized but is already started.");

            finishAnimation();

        }



        mInitTouchLocation.set(event.getX(), event.getY());

        mInitTouchLocation.set(touchX, touchY);

        mBackGestureStarted = true;



        try {
@@ -351,18 +352,18 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        mTransaction.setVisibility(screenshotSurface, true);

    }



    private void onMove(MotionEvent event, @BackEvent.SwipeEdge int swipeEdge) {

    private void onMove(float touchX, float touchY, @BackEvent.SwipeEdge int swipeEdge) {

        if (!mBackGestureStarted || mBackNavigationInfo == null) {

            return;

        }

        int deltaX = Math.round(event.getX() - mInitTouchLocation.x);

        int deltaX = Math.round(touchX - mInitTouchLocation.x);

        float progressThreshold = PROGRESS_THRESHOLD >= 0 ? PROGRESS_THRESHOLD : mProgressThreshold;

        float progress = Math.min(Math.max(Math.abs(deltaX) / progressThreshold, 0), 1);

        int backType = mBackNavigationInfo.getType();

        RemoteAnimationTarget animationTarget = mBackNavigationInfo.getDepartingAnimationTarget();



        BackEvent backEvent = new BackEvent(

                event.getX(), event.getY(), progress, swipeEdge, animationTarget);

                touchX, touchY, progress, swipeEdge, animationTarget);

        IOnBackInvokedCallback targetCallback = null;

        if (shouldDispatchToLauncher(backType)) {

            targetCallback = mBackToLauncherCallback;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ public class BackAnimationControllerTest { 


    private void doMotionEvent(int actionDown, int coordinate) {

        mController.onMotionEvent(

                MotionEvent.obtain(0, mEventTime, actionDown, coordinate, coordinate, 0),

                coordinate, coordinate,

                actionDown,

                BackEvent.EDGE_LEFT);

        mEventTime += 10;

packages/SystemUI/res/values-be/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ 
    <string name="quick_settings_disclosure_named_management_monitoring" msgid="2831423806103479812">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> валодае гэтай прыладай і можа кантраляваць сеткавы трафік"</string>

    <string name="quick_settings_financed_disclosure_named_management" msgid="2307703784594859524">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string>

    <string name="quick_settings_disclosure_management_named_vpn" msgid="4137564460025113168">"Гэта прылада належыць вашай арганізацыі і падключана да інтэрнэту праз праграму \"<xliff:g id="VPN_APP">%1$s</xliff:g>\""</string>

    <string name="quick_settings_disclosure_named_management_named_vpn" msgid="2169227918166358741">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" і падключана да інтэрнэту праз праграму \"<xliff:g id="VPN_APP">%2$s</xliff:g>\""</string>

    <string name="quick_settings_disclosure_named_management_named_vpn" msgid="2169227918166358741">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\" і падключана да інтэрнэту праз \"<xliff:g id="VPN_APP">%2$s</xliff:g>\""</string>

    <string name="quick_settings_disclosure_management" msgid="5515296598440684962">"Гэта прылада належыць вашай арганізацыі"</string>

    <string name="quick_settings_disclosure_named_management" msgid="3476472755775165827">"Гэта прылада належыць арганізацыі \"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>\""</string>

    <string name="quick_settings_disclosure_management_vpns" msgid="929181757984262902">"Гэта прылада належыць вашай арганізацыі і падключана да інтэрнэту праз сеткі VPN"</string>