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

Commit 2b3bd578 authored by Bill Lin's avatar Bill Lin
Browse files

Move Pip codes from SysUI to WMShell lib (9/N) 

Bug: 161118569

Test: make SystemUI
Test: make ArcSystemUI
Test: make WMShellUnitTests
Test: lunch cf_x86_tv-userdebug & make
Test: atest CtsSystemUiTestCases:BasicPipTests
Test: atest CtsSystemUiTestCases:CustomPipActionsTests
Test: atest CtsSystemUiTestCases:FlickerPipTests
Test: atest CtsSystemUiTestCases:PipNotificationTests
Test: atest SystemUITests
Test: atest WMShellUnitTests
Test: manual test PIP demo AP
Test: manual test TV PIP function
Test: manual test disabled PIP
Test: adb shell input keyevent 171(KEYCODE_WINDOW)
Test: adb shell am start -n android.systemui.cts.tv.pip/.PipTestActivity
    -a android.systemui.cts.tv.pip.PipTestActivity.enter_pip
Test: adb root;adb shell am start \
    -n com.android.systemui/com.android.wm.shell.pip.tv.PipMenuActivity
Test: adb shell dumpsys activity service com.android.systemui
Change-Id: I0ec0e9b9bfc4795a10483acd225f14bde9c72407
parent 65f9fd01

libs/WindowManager/Shell/Android.bp

+20 −1
Original line number Diff line number Diff line
@@ -23,7 +23,18 @@ java_library { 


filegroup {

    name: "wm_shell-sources",

    srcs: ["src/**/*.java"],

    srcs: [

        "src/**/*.java",

    ],

    path: "src",

}



// TODO(b/168581922) protologtool do not support kotlin(*.kt)

filegroup {

    name: "wm_shell-sources-kt",

    srcs: [

        "src/**/*.kt",

    ],

    path: "src",

}
@@ -97,15 +108,23 @@ android_library { 
    name: "WindowManager-Shell",

    srcs: [

        ":wm_shell_protolog_src",

        // TODO(b/168581922) protologtool do not support kotlin(*.kt)

        ":wm_shell-sources-kt",

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

    ],

    resource_dirs: [

        "res",

    ],

    static_libs: [

        "androidx.dynamicanimation_dynamicanimation",

        "kotlinx-coroutines-android",

        "kotlinx-coroutines-core",

        "protolog-lib",

        "WindowManager-Shell-proto",

        "androidx.appcompat_appcompat",

    ],

    kotlincflags: ["-Xjvm-default=enable"],

    manifest: "AndroidManifest.xml",



    min_sdk_version: "26",

}
 
 No newline at end of file

libs/WindowManager/Shell/res/layout/tv_pip_control_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

<!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. -->

<!-- Layout for {@link com.android.wm.shell.pip.tv.PipControlButtonView}. -->

<merge xmlns:android="http://schemas.android.com/apk/res/android">



    <ImageView android:id="@+id/button"