diff options
author | Andrii Kulian <akulian@google.com> | 2020-01-21 11:47:40 -0800 |
---|---|---|
committer | Andrii Kulian <akulian@google.com> | 2020-01-21 11:48:19 -0800 |
commit | db4f5466b925a846b6299277b0bfacc1891f6af7 (patch) | |
tree | 1b14d00e28576e793f0722e5ad3ccd5815c59070 /libs/WindowManager | |
parent | 2175e3ebef2cbcbff79e8d9ed959799d2a9c96ab (diff) |
Move WindowManager Shell from packages/ to libs/
Test: Build
Change-Id: I03833b0aff5836cc00b8371907f9059aa1acc5b1
Diffstat (limited to 'libs/WindowManager')
-rw-r--r-- | libs/WindowManager/OWNERS | 3 | ||||
-rw-r--r-- | libs/WindowManager/Shell/Android.bp | 29 | ||||
-rw-r--r-- | libs/WindowManager/Shell/AndroidManifest.xml | 20 | ||||
-rw-r--r-- | libs/WindowManager/Shell/OWNERS | 4 | ||||
-rw-r--r-- | libs/WindowManager/Shell/res/values/config.xml | 21 | ||||
-rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/WindowManagerShell.java | 23 | ||||
-rw-r--r-- | libs/WindowManager/Shell/tests/Android.bp | 45 | ||||
-rw-r--r-- | libs/WindowManager/Shell/tests/AndroidManifest.xml | 32 | ||||
-rw-r--r-- | libs/WindowManager/Shell/tests/AndroidTest.xml | 31 | ||||
-rw-r--r-- | libs/WindowManager/Shell/tests/res/values/config.xml | 21 | ||||
-rw-r--r-- | libs/WindowManager/Shell/tests/src/com/android/wm/shell/tests/WindowManagerShellTest.java | 40 |
11 files changed, 269 insertions, 0 deletions
diff --git a/libs/WindowManager/OWNERS b/libs/WindowManager/OWNERS new file mode 100644 index 000000000000..063d4594f2fa --- /dev/null +++ b/libs/WindowManager/OWNERS @@ -0,0 +1,3 @@ +set noparent + +include ../../services/core/java/com/android/server/wm/OWNERS
\ No newline at end of file diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp new file mode 100644 index 000000000000..b8934dc8c583 --- /dev/null +++ b/libs/WindowManager/Shell/Android.bp @@ -0,0 +1,29 @@ +// Copyright (C) 2019 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. + +android_library { + name: "WindowManager-Shell", + srcs: [ + "src/**/*.java", + "src/**/I*.aidl", + ], + resource_dirs: [ + "res", + ], + manifest: "AndroidManifest.xml", + + platform_apis: true, + sdk_version: "current", + min_sdk_version: "system_current", +} diff --git a/libs/WindowManager/Shell/AndroidManifest.xml b/libs/WindowManager/Shell/AndroidManifest.xml new file mode 100644 index 000000000000..ea8a5c305029 --- /dev/null +++ b/libs/WindowManager/Shell/AndroidManifest.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2019 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.wm.shell"> +</manifest> diff --git a/libs/WindowManager/Shell/OWNERS b/libs/WindowManager/Shell/OWNERS new file mode 100644 index 000000000000..4390004f5f93 --- /dev/null +++ b/libs/WindowManager/Shell/OWNERS @@ -0,0 +1,4 @@ +# sysui owners +hwwang@google.com +mrenouf@google.com +winsonc@google.com
\ No newline at end of file diff --git a/libs/WindowManager/Shell/res/values/config.xml b/libs/WindowManager/Shell/res/values/config.xml new file mode 100644 index 000000000000..c894eb0133b5 --- /dev/null +++ b/libs/WindowManager/Shell/res/values/config.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2019, 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. +*/ +--> + +<resources> +</resources>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/WindowManagerShell.java b/libs/WindowManager/Shell/src/com/android/wm/shell/WindowManagerShell.java new file mode 100644 index 000000000000..273bd27a221b --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/WindowManagerShell.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2019 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.wm.shell; + +/** + * Interface for the shell. + */ +public class WindowManagerShell { +} diff --git a/libs/WindowManager/Shell/tests/Android.bp b/libs/WindowManager/Shell/tests/Android.bp new file mode 100644 index 000000000000..78fa45ebdf94 --- /dev/null +++ b/libs/WindowManager/Shell/tests/Android.bp @@ -0,0 +1,45 @@ +// Copyright (C) 2019 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. + +android_test { + name: "WindowManagerShellTests", + + srcs: ["**/*.java"], + + static_libs: [ + "WindowManager-Shell", + "junit", + "androidx.test.runner", + "androidx.test.rules", + "androidx.test.ext.junit", + "mockito-target-extended-minus-junit4", + "truth-prebuilt", + ], + libs: [ + "android.test.mock", + "android.test.base", + "android.test.runner", + ], + jni_libs: [ + "libdexmakerjvmtiagent", + "libstaticjvmtiagent", + ], + + sdk_version: "current", + platform_apis: true, + + optimize: { + enabled: false, + }, +} diff --git a/libs/WindowManager/Shell/tests/AndroidManifest.xml b/libs/WindowManager/Shell/tests/AndroidManifest.xml new file mode 100644 index 000000000000..a8f795ec8a8d --- /dev/null +++ b/libs/WindowManager/Shell/tests/AndroidManifest.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + xmlns:tools="http://schemas.android.com/tools" + package="com.android.wm.shell.tests"> + + <application android:debuggable="true" android:largeHeap="true"> + <uses-library android:name="android.test.mock" /> + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation + android:name="androidx.test.runner.AndroidJUnitRunner" + android:label="Tests for WindowManager-Shell" + android:targetPackage="com.android.wm.shell.tests"> + </instrumentation> +</manifest> diff --git a/libs/WindowManager/Shell/tests/AndroidTest.xml b/libs/WindowManager/Shell/tests/AndroidTest.xml new file mode 100644 index 000000000000..4dce4db360e4 --- /dev/null +++ b/libs/WindowManager/Shell/tests/AndroidTest.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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. +--> +<configuration description="Runs Tests for WindowManagerShellLib"> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="install-arg" value="-t" /> + <option name="test-file-name" value="WindowManagerShellTests.apk" /> + </target_preparer> + + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="framework-base-presubmit" /> + <option name="test-tag" value="WindowManagerShellTests" /> + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.wm.shell.tests" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> + <option name="hidden-api-checks" value="false"/> + </test> +</configuration> diff --git a/libs/WindowManager/Shell/tests/res/values/config.xml b/libs/WindowManager/Shell/tests/res/values/config.xml new file mode 100644 index 000000000000..c894eb0133b5 --- /dev/null +++ b/libs/WindowManager/Shell/tests/res/values/config.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2019, 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. +*/ +--> + +<resources> +</resources>
\ No newline at end of file diff --git a/libs/WindowManager/Shell/tests/src/com/android/wm/shell/tests/WindowManagerShellTest.java b/libs/WindowManager/Shell/tests/src/com/android/wm/shell/tests/WindowManagerShellTest.java new file mode 100644 index 000000000000..376875b143a1 --- /dev/null +++ b/libs/WindowManager/Shell/tests/src/com/android/wm/shell/tests/WindowManagerShellTest.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2019 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.wm.shell.tests; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.wm.shell.WindowManagerShell; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * Tests for the shell. + */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public class WindowManagerShellTest { + + WindowManagerShell mShell; + + @Test + public void testNothing() { + // Do nothing + } +} |