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

Commit e6836f5c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Separating packageName from the AndroidManifest"

parents 9244b380 eb18d398

packages/SystemUI/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -86,7 +86,9 @@ filegroup { 


android_library {

    name: "SystemUI-tests",

    manifest: "tests/AndroidManifest.xml",

    manifest: "tests/AndroidManifest-base.xml",

    additional_manifests: ["tests/AndroidManifest.xml"],



    resource_dirs: [

        "tests/res",

        "res-product",

packages/SystemUI/tests/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui 
# UI it doesn't own. This is necessary to allow screenshots to be taken

LOCAL_CERTIFICATE := platform



LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest.xml

LOCAL_MANIFEST_FILE := AndroidManifest-base.xml



# Provide jack a list of classes to exclude from code coverage.

# This is needed because the SystemUITests compile SystemUI source directly, rather than using

# LOCAL_INSTRUMENTATION_FOR := SystemUI.

packages/SystemUI/tests/AndroidManifest-base.xml

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

<!-- Copyright (C) 2011 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"

    android:sharedUserId="android.uid.system"

    package="com.android.systemui.tests" />

packages/SystemUI/tests/AndroidManifest.xml

+1 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:sharedUserId="android.uid.system"

    package="com.android.systemui.tests">

    package="com.android.systemui" >



    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

    <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" />
@@ -55,11 +55,6 @@ 


    <application android:debuggable="true" android:largeHeap="true">

        <uses-library android:name="android.test.runner" />

        <activity android:name="com.android.systemui.screenshot.ScreenshotStubActivity" />



        <service

            android:name="com.android.systemui.qs.external.TileLifecycleManagerTests$FakeTileService"

            android:process=":killable" />



        <receiver android:name="com.android.systemui.SliceBroadcastRelayHandlerTest$Receiver">

            <intent-filter>

packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotStubActivity.java

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 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.screenshot;



import android.app.Activity;

import android.os.Bundle;



import com.android.systemui.tests.R;



/**

 * A stub activity used in {@link ScreenshotTest}.

 */

public class ScreenshotStubActivity extends Activity {



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.main);

    }

}