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

Commit a8e72d46 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Move Keyguard to SystemUI"

parents 1c2beb2e 23f85ec1

packages/Keyguard/Android.mk

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
# Copyright (C) 2013 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.

#



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := SystemUI-tags



LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags



include $(BUILD_STATIC_JAVA_LIBRARY)



# ------------------



include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)



LOCAL_MODULE := Keyguard



LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := SettingsLib



LOCAL_STATIC_JAVA_LIBRARIES = SystemUI-tags



LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_JAR_EXCLUDE_FILES := none



include $(BUILD_STATIC_JAVA_LIBRARY)



#include $(call all-makefiles-under,$(LOCAL_PATH))

packages/Keyguard/test/Android.mk

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
# Copyright (C) 2013 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.

#



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := KeyguardTest



# Remove these to verify permission checks are working correctly

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



# LOCAL_PROGUARD_FLAG_FILES := proguard.flags



include $(BUILD_PACKAGE)

packages/Keyguard/test/AndroidManifest.xml

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

<!--

/*

** Copyright 2013, 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.keyguard.test">

    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>

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

    <application android:label="@string/app_name" android:icon="@drawable/app_icon">

        <activity android:name=".KeyguardTestActivity"

                android:label="@string/app_name"

                android:theme="@android:style/Theme.DeviceDefault.Light">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>

packages/Keyguard/test/SampleTrustAgent/Android.mk

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
# Copyright (C) 2014 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.

#



LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := SampleTrustAgent



# Remove this to verify permission checks are working correctly

LOCAL_CERTIFICATE := platform



LOCAL_MODULE_TAGS := tests



# LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4



include $(BUILD_PACKAGE)

packages/Keyguard/test/SampleTrustAgent/AndroidManifest.xml

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

<!--

  ~ Copyright (C) 2014 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.trustagent.test">

    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>

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

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

    <application android:label="@string/app_name">

      <service

          android:name=".SampleTrustAgent"

          android:label="@string/app_name"

          android:permission="android.permission.BIND_TRUST_AGENT"

          android:directBootAware="true"

          android:exported="true">

        <intent-filter>

          <action android:name="android.service.trust.TrustAgentService" />

          <category android:name="android.intent.category.DEFAULT" />

        </intent-filter>

        <meta-data android:name="android.service.trust.trustagent"

                   android:resource="@xml/sample_trust_agent"/>

      </service>



      <activity

          android:name=".SampleTrustAgentSettings"

          android:label="@string/app_name"

          android:exported="true"

          android:launchMode="singleInstance" >

          <intent-filter>

              <action android:name="android.intent.action.MAIN" />

              <category android:name="android.intent.category.LAUNCHER" />

          </intent-filter>

      </activity>

    </application>

</manifest>