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

Commit b8614e29 authored by Sebastián Franco's avatar Sebastián Franco Committed by Automerger Merge Worker
Browse files

Merge "Making sure there is a propper Chrome icon for the test to long press"... 

Merge "Making sure there is a propper Chrome icon for the test to long press" into tm-qpr-dev am: 41228682

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21778872



Change-Id: I274f6eae4cda80ea45ee48328b6d2a5abfb1e648
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b167a803 41228682

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+6 −0
Original line number Diff line number Diff line
@@ -221,6 +221,12 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                return response;

            }



            case TestProtocol.REQUEST_USE_TAPL_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(

                        LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TAPL);

                return response;

            }



            case TestProtocol.REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(null);

                return response;

res/xml/default_tapl_test_workspace.xml

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

<!-- Copyright (C) 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- Split display specific version of Launcher3/res/xml/default_workspace_4x4.xml -->

<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" >



    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->

    <favorite

        launcher:container="-101"

        launcher:screen="0"

        launcher:x="0"

        launcher:y="0"

        launcher:className="com.google.android.apps.chrome.Main"

        launcher:packageName="com.android.chrome" />



</favorites>

src/com/android/launcher3/LauncherProvider.java

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public class LauncherProvider extends ContentProvider { 


    private static final int TEST_WORKSPACE_LAYOUT_RES_XML = R.xml.default_test_workspace;

    private static final int TEST2_WORKSPACE_LAYOUT_RES_XML = R.xml.default_test2_workspace;

    private static final int TAPL_WORKSPACE_LAYOUT_RES_XML = R.xml.default_tapl_test_workspace;



    static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED";
@@ -410,6 +411,9 @@ public class LauncherProvider extends ContentProvider { 
                    case LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2:

                        mDefaultWorkspaceLayoutOverride = TEST2_WORKSPACE_LAYOUT_RES_XML;

                        break;

                    case LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TAPL:

                        mDefaultWorkspaceLayoutOverride = TAPL_WORKSPACE_LAYOUT_RES_XML;

                        break;

                    default:

                        mDefaultWorkspaceLayoutOverride = 0;

                        break;

src/com/android/launcher3/LauncherSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ public class LauncherSettings { 
                "set_use_test_workspace_layout_flag";

        public static final String ARG_DEFAULT_WORKSPACE_LAYOUT_TEST = "default_test_workspace";

        public static final String ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2 = "default_test2_workspace";

        public static final String ARG_DEFAULT_WORKSPACE_LAYOUT_TAPL = "default_tapl_workspace";



        public static final String METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG =

                "clear_use_test_workspace_layout_flag";

tests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public final class TestProtocol { 
    public static final String REQUEST_CLEAR_DATA = "clear-data";

    public static final String REQUEST_USE_TEST_WORKSPACE_LAYOUT = "use-test-workspace-layout";

    public static final String REQUEST_USE_TEST2_WORKSPACE_LAYOUT = "use-test2-workspace-layout";

    public static final String REQUEST_USE_TAPL_WORKSPACE_LAYOUT = "use-tapl-workspace-layout";

    public static final String REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT =

            "use-default-workspace-layout";

    public static final String REQUEST_HOTSEAT_ICON_NAMES = "get-hotseat-icon-names";