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

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

Snap for 9316743 from 837507ea to tm-qpr2-release 

Change-Id: I00666b24b9bfa7cc2a56d534c68616545fbda462
parents 02e6e0a7 837507ea

libs/WindowManager/Shell/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -66,8 +66,10 @@ 
    <!-- Multi-Window strings -->

    <!-- Text that gets shown on top of current activity to inform the user that the system force-resized the current activity to be displayed in split-screen and that things might crash/not work properly [CHAR LIMIT=NONE] -->

    <string name="dock_forced_resizable">App may not work with split-screen.</string>

    <!-- Warning message when we try to dock a non-resizeable task and launch it in fullscreen instead. -->

    <!-- Warning message when we try to dock a non-resizeable task and launch it in fullscreen instead  [CHAR LIMIT=NONE] -->

    <string name="dock_non_resizeble_failed_to_dock_text">App does not support split-screen.</string>

    <!-- Warning message when we try to dock an app not supporting multiple instances split into multiple sides [CHAR LIMIT=NONE] -->

    <string name="dock_multi_instances_not_supported_text">This app can only be opened in 1 window.</string>

    <!-- Text that gets shown on top of current activity to inform the user that the system force-resized the current activity to be displayed on a secondary display and that things might crash/not work properly [CHAR LIMIT=NONE] -->

    <string name="forced_resizable_secondary_display">App may not work on a secondary display.</string>

    <!-- Warning message when we try to launch a non-resizeable activity on a secondary display and launch it on the primary instead. -->

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/DividerView.java

+11 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
    private GestureDetector mDoubleTapDetector;

    private boolean mInteractive;

    private boolean mSetTouchRegion = true;

    private int mLastDraggingPosition;



    /**

     * Tracks divider bar visible bounds in screen-based coordination. Used to calculate with
@@ -298,6 +299,7 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
                }

                if (mMoving) {

                    final int position = mSplitLayout.getDividePosition() + touchPos - mStartPos;

                    mLastDraggingPosition = position;

                    mSplitLayout.updateDivideBounds(position);

                }

                break;
@@ -372,6 +374,15 @@ public class DividerView extends FrameLayout implements View.OnTouchListener { 
                "Set divider bar %s from %s", interactive ? "interactive" : "non-interactive",

                from);

        mInteractive = interactive;

        if (!mInteractive && mMoving) {

            final int position = mSplitLayout.getDividePosition();

            mSplitLayout.flingDividePosition(

                    mLastDraggingPosition,

                    position,

                    mSplitLayout.FLING_RESIZE_DURATION,

                    () -> mSplitLayout.setDividePosition(position, true /* applyLayoutChange */));

            mMoving = false;

        }

        releaseTouching();

        mHandle.setVisibility(mInteractive ? View.VISIBLE : View.INVISIBLE);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    public static final int PARALLAX_DISMISSING = 1;

    public static final int PARALLAX_ALIGN_CENTER = 2;



    private static final int FLING_RESIZE_DURATION = 250;

    public static final int FLING_RESIZE_DURATION = 250;

    private static final int FLING_SWITCH_DURATION = 350;

    private static final int FLING_ENTER_DURATION = 450;

    private static final int FLING_EXIT_DURATION = 450;

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.view.RemoteAnimationTarget; 
import android.view.SurfaceControl;

import android.view.SurfaceSession;

import android.view.WindowManager;

import android.widget.Toast;

import android.window.RemoteTransition;

import android.window.WindowContainerTransaction;
@@ -597,6 +598,10 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
            } else if (isSplitScreenVisible()) {

                mStageCoordinator.switchSplitPosition("startIntent");

                return;

            } else {

                Toast.makeText(mContext, R.string.dock_multi_instances_not_supported_text,

                        Toast.LENGTH_SHORT).show();

                return;

            }

        }

packages/SystemUI/res/values/strings.xml

+46 −0
Original line number Diff line number Diff line
@@ -2679,4 +2679,50 @@ 


    <!-- Time format for the Dream Time Complication for 24-hour time format [CHAR LIMIT=NONE] -->

    <string name="dream_time_complication_24_hr_time_format">kk:mm</string>



    <!--

    Template for an action that opens a specific app. [CHAR LIMIT=16]

    -->

    <string name="keyguard_affordance_enablement_dialog_action_template">Open <xliff:g id="appName" example="Wallet">%1$s</xliff:g></string>



    <!--

    Template for a message shown right before a list of instructions that tell the user what to do

    in order to enable a shortcut to a specific app. [CHAR LIMIT=NONE]

    -->

    <string name="keyguard_affordance_enablement_dialog_message">To add the <xliff:g id="appName" example="Wallet">%1$s</xliff:g> app as a shortcut, make sure</string>



    <!--

    Requirement for the wallet app to be available for the user to use. This is shown as part of a

    bulleted list of requirements. When all requirements are met, the app can be accessed through a

    shortcut button on the lock screen. [CHAR LIMIT=NONE].

    -->

    <string name="keyguard_affordance_enablement_dialog_wallet_instruction_1">&#8226; The app is set up</string>



    <!--

    Requirement for the wallet app to be available for the user to use. This is shown as part of a

    bulleted list of requirements. When all requirements are met, the app can be accessed through a

    shortcut button on the lock screen. [CHAR LIMIT=NONE].

    -->

    <string name="keyguard_affordance_enablement_dialog_wallet_instruction_2">&#8226; At least one card has been added to Wallet</string>



    <!--

    Requirement for the QR code scanner functionality to be available for the user to use. This is

    shown as part of a bulleted list of requirements. When all requirements are met, the piece of

    functionality can be accessed through a shortcut button on the lock screen. [CHAR LIMIT=NONE].

    -->

    <string name="keyguard_affordance_enablement_dialog_qr_scanner_instruction">&#8226; Install a camera app</string>



    <!--

    Requirement for the home app to be available for the user to use. This is shown as part of a

    bulleted list of requirements. When all requirements are met, the app can be accessed through a

    shortcut button on the lock screen. [CHAR LIMIT=NONE].

    -->

    <string name="keyguard_affordance_enablement_dialog_home_instruction_1">&#8226; The app is set up</string>



    <!--

    Requirement for the home app to be available for the user to use. This is shown as part of a

    bulleted list of requirements. When all requirements are met, the app can be accessed through a

    shortcut button on the lock screen. [CHAR LIMIT=NONE].

    -->

    <string name="keyguard_affordance_enablement_dialog_home_instruction_2">&#8226; At least one device is available</string>

</resources>