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

Commit 5f250bdc authored by Natiq Ahmed's avatar Natiq Ahmed
Browse files

Enable statusbar. 

Enable statusbar

Change-Id: I8130846af95b3bfc42819a5f4fad758bb95155e8
parent f197788e

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

+27 −16
Original line number Diff line number Diff line
@@ -15,34 +15,45 @@ 
 */

package com.android.internal.policy;



import android.view.MotionEvent;



import com.android.internal.policy.IKeyguardShowCallback;

import com.android.internal.policy.IKeyguardStateCallback;

import com.android.internal.policy.IKeyguardExitCallback;



import android.os.Bundle;



oneway interface IKeyguardService {

interface IKeyguardService {



     boolean isShowing();

     boolean isSecure();

     boolean isShowingAndNotOccluded();

     boolean isInputRestricted();

     boolean isDismissable();

     oneway void verifyUnlock(IKeyguardExitCallback callback);

     oneway void keyguardDone(boolean authenticated, boolean wakeup);

 

    /**

     * Sets the Keyguard as occluded when a window dismisses the Keyguard with flag

     * FLAG_SHOW_ON_LOCK_SCREEN.

     *

     * @param isOccluded Whether the Keyguard is occluded by another window.

     */

    void setOccluded(boolean isOccluded);

    int setOccluded(boolean isOccluded);



    void addStateMonitorCallback(IKeyguardStateCallback callback);

    void verifyUnlock(IKeyguardExitCallback callback);

    void keyguardDone(boolean authenticated, boolean wakeup);

    void dismiss();

    void onDreamingStarted();

    void onDreamingStopped();

    void onScreenTurnedOff(int reason);

    void onScreenTurnedOn(IKeyguardShowCallback callback);

    void setKeyguardEnabled(boolean enabled);

    void onSystemReady();

    void doKeyguardTimeout(in Bundle options);

    void setCurrentUser(int userId);

    void onBootCompleted();

     oneway void dismiss();

     oneway void onDreamingStarted();

     oneway void onDreamingStopped();

     oneway void onScreenTurnedOff(int reason);

     oneway void onScreenTurnedOn(IKeyguardShowCallback callback);

     oneway void setKeyguardEnabled(boolean enabled);

     oneway void onSystemReady();

     oneway void doKeyguardTimeout(in Bundle options);

     oneway void setCurrentUser(int userId);

     oneway void showAssistant();

     oneway void dispatch(in MotionEvent event);

     oneway void onBootCompleted();



    /**

     * Notifies that the activity behind has now been drawn and it's safe to remove the wallpaper
@@ -51,11 +62,11 @@ oneway interface IKeyguardService { 
     * @param startTime the start time of the animation in uptime milliseconds

     * @param fadeoutDuration the duration of the exit animation, in milliseconds

     */

    void startKeyguardExitAnimation(long startTime, long fadeoutDuration);

    oneway void startKeyguardExitAnimation(long startTime, long fadeoutDuration);



    /**

     * Notifies the Keyguard that the activity that was starting has now been drawn and it's safe

     * to start the keyguard dismiss sequence.

     */

    void onActivityDrawn();

    oneway void onActivityDrawn();

}

packages/Keyguard/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -30,4 +30,4 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 


include $(BUILD_STATIC_JAVA_LIBRARY)



#include $(call all-makefiles-under,$(LOCAL_PATH))
 
 No newline at end of file
 
include $(call all-makefiles-under,$(LOCAL_PATH))

packages/Keyguard/src/com/android/keyguard/CarrierText.java

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class CarrierText extends LinearLayout { 
    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mSeparator = getResources().getString(R.string.kg_text_message_separator);

        mSeparator = getResources().getString(com.android.internal.R.string.kg_text_message_separator);

        int[] operatorNameId = {R.id.carrier1, R.id.carrier2, R.id.carrier3};

        int[] operatorSepId = {R.id.carrier_divider1, R.id.carrier_divider2};

        final boolean screenOn = KeyguardUpdateMonitor.getInstance(mContext).isScreenOn();

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
         * Determine whether the device is plugged in (USB, power, or wireless).

         * @return true if the device is plugged in.

         */

        boolean isPluggedIn() {

        public boolean isPluggedIn() {

            return plugged == BatteryManager.BATTERY_PLUGGED_AC

                    || plugged == BatteryManager.BATTERY_PLUGGED_USB

                    || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;

packages/Keyguard/test/src/com/android/keyguard/test/KeyguardTestActivity.java

+8 −6
Original line number Diff line number Diff line
@@ -284,26 +284,28 @@ public class KeyguardTestActivity extends Activity implements OnClickListener { 
    @Override

    protected void onPause() {

        super.onPause();

        try {

        /*try {

            if (mService != null) {

                mService.setHidden(true);

                //FIXME: LMR1_INTERNAL

                //mService.setHidden(true);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Remote service died");

            e.printStackTrace();

        }

        } */

    }



    protected void onResume() {

        super.onResume();

        try {

       /* try {

            if (mService != null) {

                mService.setHidden(false);

                //FIXME: LMR1_INTERNAL

                //mService.setHidden(false);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Remote service died");

            e.printStackTrace();

        }

        } */

    }



    public int mSecurityModeMock;