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

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

Merge changes I254d6fc6,I360e9ac7 

* changes:
  Move keyguard to its own process.
  Move keyguard source and resources into new package
parents e84da7fa 5ecd8115

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/backup/IBackupTransport.aidl \

	core/java/com/android/internal/policy/IFaceLockCallback.aidl \

	core/java/com/android/internal/policy/IFaceLockInterface.aidl \

	core/java/com/android/internal/policy/IKeyguardResult.aidl \

	core/java/com/android/internal/policy/IKeyguardService.aidl \

	core/java/com/android/internal/os/IDropBoxManagerService.aidl \

	core/java/com/android/internal/os/IResultReceiver.aidl \

	core/java/com/android/internal/statusbar/IStatusBar.aidl \

core/java/android/appwidget/AppWidgetHost.java

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ public class AppWidgetHost { 
     * @return a appWidgetId

     */

    public int allocateAppWidgetId() {



        try {

            if (mPackageName == null) {

                mPackageName = mContext.getPackageName();

core/java/android/view/WindowManager.java

+8 −0
Original line number Diff line number Diff line
@@ -527,6 +527,14 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_RECENTS_OVERLAY = FIRST_SYSTEM_WINDOW+28;





        /**

         * Window type: keyguard scrim window. Shows if keyguard needs to be restarted.

         * In multiuser systems shows on all users' windows.

         * @hide

         */

        public static final int TYPE_KEYGUARD_SCRIM           = FIRST_SYSTEM_WINDOW+29;



        /**

         * End of types of system windows.

         */

core/java/com/android/internal/policy/IKeyguardResult.aidl

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 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.internal.policy;



oneway interface IKeyguardResult {

    void onShown(IBinder windowToken);

    void onKeyguardExitResult(boolean success);

}

core/java/com/android/internal/policy/IKeyguardService.aidl

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 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.internal.policy;



import com.android.internal.policy.IKeyguardResult;



import android.os.Bundle;



interface IKeyguardService {

    boolean isShowing();

    boolean isSecure();

    boolean isShowingAndNotHidden();

    boolean isInputRestricted();

    boolean isDismissable();

    oneway void userActivity();

    oneway void verifyUnlock(IKeyguardResult result);

    oneway void keyguardDone(boolean authenticated, boolean wakeup);

    oneway void setHidden(boolean isHidden);

    oneway void dismiss();

    oneway void onWakeKeyWhenKeyguardShowingTq(int keyCode);

    oneway void onWakeMotionWhenKeyguardShowingTq();

    oneway void onDreamingStarted();

    oneway void onDreamingStopped();

    oneway void onScreenTurnedOff(int reason);

    oneway void onScreenTurnedOn(IKeyguardResult result);

    oneway void setKeyguardEnabled(boolean enabled);

    oneway void onSystemReady();

    oneway void doKeyguardTimeout(in Bundle options);

    oneway void setCurrentUser(int userId);

    oneway void showAssistant();

}