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

Commit 74c85198 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Adds the initial SmartSpace shared element transition!" into sc-dev am: 3ec95514 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14472057

Change-Id: I49ce737bfe96af14baee989a42ff3bb23a079e50
parents 21a787bb 3ec95514

packages/SystemUI/shared/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ android_library { 
    name: "SystemUISharedLib",

    srcs: [

        "src/**/*.java",

        "src/**/I*.aidl",

        "src/**/*.kt",

        "src/**/*.aidl",

        ":wm_shell-aidls",

    ],

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ import java.util.StringJoiner; 
 * Various shared constants between Launcher and SysUI as part of quickstep

 */

public class QuickStepContract {

    // Fully qualified name of the Launcher activity.

    public static final String LAUNCHER_ACTIVITY_CLASS_NAME =

            "com.google.android.apps.nexuslauncher.NexusLauncherActivity";



    public static final String KEY_EXTRA_SYSUI_PROXY = "extra_sysui_proxy";

    public static final String KEY_EXTRA_WINDOW_CORNER_RADIUS = "extra_window_corner_radius";
@@ -52,6 +55,8 @@ public class QuickStepContract { 
    // See IStartingWindow.aidl

    public static final String KEY_EXTRA_SHELL_STARTING_WINDOW =

            "extra_shell_starting_window";

    // See ISmartspaceTransitionController.aidl

    public static final String KEY_EXTRA_SMARTSPACE_TRANSITION_CONTROLLER = "smartspace_transition";



    public static final String NAV_BAR_MODE_2BUTTON_OVERLAY =

            WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON_OVERLAY;

packages/SystemUI/shared/src/com/android/systemui/shared/system/smartspace/ISmartspaceCallback.aidl

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */



package com.android.systemui.shared.system.smartspace;



import com.android.systemui.shared.system.smartspace.SmartspaceState;



// Methods for getting and setting the state of a SmartSpace. This is used to allow a remote process

// (such as System UI) to sync with and control a SmartSpace view hosted in another process (such as

// Launcher).

interface ISmartspaceCallback {



    // Return information about the state of the SmartSpace, including location on-screen and

    // currently selected page.

    SmartspaceState getSmartspaceState();



    // Set the currently selected page of this SmartSpace.

    oneway void setSelectedPage(int selectedPage);



    oneway void setVisibility(int visibility);

}
 
 No newline at end of file

packages/SystemUI/shared/src/com/android/systemui/shared/system/smartspace/ISmartspaceTransitionController.aidl

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */



package com.android.systemui.shared.system.smartspace;



import com.android.systemui.shared.system.smartspace.ISmartspaceCallback;



// Controller that keeps track of SmartSpace instances in remote processes (such as Launcher).

interface ISmartspaceTransitionController {

    oneway void setSmartspace(ISmartspaceCallback callback);

}
 
 No newline at end of file

packages/SystemUI/shared/src/com/android/systemui/shared/system/smartspace/SmartspaceState.aidl

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */



package com.android.systemui.shared.system.smartspace;



import com.android.systemui.shared.system.smartspace.SmartspaceState;



parcelable SmartspaceState;
 
 No newline at end of file