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

Commit 3853e0c3 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Add keyguard background scrim and protection around keyguard APIs"

parents fd782549 c0b676dc

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -2209,6 +2209,13 @@ 
        android:label="@string/permlab_access_keyguard_secure_storage"

        android:description="@string/permdesc_access_keyguard_secure_storage" />



    <!-- Allows an application to control keyguard.  Only allowed for system processes.

        @hide -->

    <permission android:name="android.permission.CONTROL_KEYGUARD"

        android:protectionLevel="signature"

        android:label="@string/permlab_control_keyguard"

        android:description="@string/permdesc_control_keyguard" />



    <!-- Must be required by an {@link

         android.service.notification.NotificationListenerService},

         to ensure that only the system can bind to it. -->

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -3474,6 +3474,11 @@ 
    <!-- Description of an application permission that lets an application access keyguard secure storage. -->

    <string name="permdesc_access_keyguard_secure_storage">Allows an application to access keguard secure storage.</string>



    <!-- Title of an application permission that lets it control keyguard. -->

    <string name="permlab_control_keyguard">Control displaying and hiding keyguard</string>

    <!-- Description of an application permission that lets it control keyguard. -->

    <string name="permdesc_control_keyguard">Allows an application to control keguard.</string>



    <!-- Shown in the tutorial for tap twice for zoom control. -->

    <string name="tutorial_double_tap_to_zoom_message_short">Touch twice for zoom control</string>

packages/Keyguard/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



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

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



LOCAL_JAVA_LIBRARIES := services
@@ -28,4 +28,4 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 


include $(BUILD_PACKAGE)



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

packages/Keyguard/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
    <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />

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



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

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

        android:process="com.android.systemui.keyguard"

        android:persistent="true" >

packages/Keyguard/res/drawable-nodpi/app_icon.png

deleted100644 → 0
−151 KiB
Loading image diff...