CAF based Demo for LLS (24b1797e) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ package android {
		field public static final java.lang.String INSTALL_SHORTCUT = "com.android.launcher.permission.INSTALL_SHORTCUT";
		field public static final java.lang.String INTERNET = "android.permission.INTERNET";
		field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
		field public static final java.lang.String LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE = "cyanogenmod.permission.LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE";
		field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
		field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
		field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
		@@ -124,6 +125,7 @@ package android {
		field public static final java.lang.String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";
		field public static final java.lang.String STATUS_BAR = "android.permission.STATUS_BAR";
		field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
		field public static final java.lang.String THIRD_PARTY_KEYGUARD = "cyanogenmod.permission.THIRD_PARTY_KEYGUARD";
		field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
		field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";
		field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ package android {
		field public static final java.lang.String INTERNET = "android.permission.INTERNET";
		field public static final java.lang.String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";
		field public static final java.lang.String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
		field public static final java.lang.String LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE = "cyanogenmod.permission.LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE";
		field public static final java.lang.String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";
		field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
		field public static final java.lang.String LOOP_RADIO = "android.permission.LOOP_RADIO";
		@@ -209,6 +210,7 @@ package android {
		field public static final java.lang.String STATUS_BAR = "android.permission.STATUS_BAR";
		field public static final java.lang.String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";
		field public static final java.lang.String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
		field public static final java.lang.String THIRD_PARTY_KEYGUARD = "cyanogenmod.permission.THIRD_PARTY_KEYGUARD";
		field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
		field public static final java.lang.String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";
		field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";

core/java/android/view/WindowManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,7 @@ public interface WindowManager extends ViewManager {
		* @see #TYPE_SYSTEM_ERROR
		* @see #TYPE_INPUT_METHOD
		* @see #TYPE_INPUT_METHOD_DIALOG
		* @see #TYPE_KEYGUARD_PANEL
		*/
		@ViewDebug.ExportedProperty(mapping = {
		@ViewDebug.IntToString(from = TYPE_BASE_APPLICATION, to = "TYPE_BASE_APPLICATION"),
		@@ -226,6 +227,7 @@ public interface WindowManager extends ViewManager {
		@ViewDebug.IntToString(from = TYPE_PRIVATE_PRESENTATION, to = "TYPE_PRIVATE_PRESENTATION"),
		@ViewDebug.IntToString(from = TYPE_VOICE_INTERACTION, to = "TYPE_VOICE_INTERACTION"),
		@ViewDebug.IntToString(from = TYPE_VOICE_INTERACTION_STARTING, to = "TYPE_VOICE_INTERACTION_STARTING"),
		@ViewDebug.IntToString(from = TYPE_KEYGUARD_PANEL, to = "TYPE_KEYGUARD_PANEL"),
		})
		public int type;

		@@ -564,6 +566,13 @@ public interface WindowManager extends ViewManager {
		*/
		public static final int TYPE_VOICE_INTERACTION_STARTING = FIRST_SYSTEM_WINDOW+33;

		/**
		* Window type: Windows that are layered within the keyguard
		* This type is LAST_SYSTEM_WINDOW-1 to avoid future conflicts with AOSP
		* @hide
		*/
		public static final int TYPE_KEYGUARD_PANEL = FIRST_SYSTEM_WINDOW+998;

		/**
		* End of types of system windows.
		*/

packages/SystemUI/Android.mk

+15 −0

Original line number	Diff line number	Diff line
		@@ -25,10 +25,25 @@ ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)
		LOCAL_JACK_ENABLED := incremental
		endif

		LOCAL_PROGUARD_FLAGS += -dontwarn

		LOCAL_STATIC_JAVA_LIBRARIES += cmsdk
		LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest_extra.xml

		include frameworks/base/packages/SettingsLib/common.mk

		include $(BUILD_PACKAGE)


		# CMSDK
		include $(CLEAR_VARS)

		LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
		cmsdk:libs/platform.sdk-5.0.1.jar

		include $(BUILD_MULTI_PREBUILT)


		ifeq ($(EXCLUDE_SYSTEMUI_TESTS),)
		include $(call all-makefiles-under,$(LOCAL_PATH))
		endif

packages/SystemUI/AndroidManifest_extra.xml

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/* //device/apps/common/AndroidManifest.xml
		**
		** Copyright 2006, 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="android">

		<!-- Allows an application to be used as a third party keyguard -->
		<permission android:name="cyanogenmod.permission.THIRD_PARTY_KEYGUARD"
		android:protectionLevel="normal" />

		<permission android:name="cyanogenmod.permission.LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE"
		android:protectionLevel="signature\|privileged" />

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

		</manifest>