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

Commit 358c7f6d authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes I85e60cfc,I82a5aea6 into udc-dev 

* changes:
  Make getCurrentController async friendly.
  Add custom message to bouncer
parents 2f535b33 51f3d51f

packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,11 @@ public interface ActivityStarter { 
    void postStartActivityDismissingKeyguard(Intent intent, int delay);

    void postStartActivityDismissingKeyguard(Intent intent, int delay);

    void postStartActivityDismissingKeyguard(Intent intent, int delay,

    void postStartActivityDismissingKeyguard(Intent intent, int delay,

            @Nullable ActivityLaunchAnimator.Controller animationController);

            @Nullable ActivityLaunchAnimator.Controller animationController);



    /** Posts a start activity intent that dismisses keyguard. */

    void postStartActivityDismissingKeyguard(Intent intent, int delay,

            @Nullable ActivityLaunchAnimator.Controller animationController,

            @Nullable String customMessage);

    void postStartActivityDismissingKeyguard(PendingIntent intent);

    void postStartActivityDismissingKeyguard(PendingIntent intent);





    /**

    /**
@@ -93,6 +98,10 @@ public interface ActivityStarter { 
    void dismissKeyguardThenExecute(OnDismissAction action, @Nullable Runnable cancel,

    void dismissKeyguardThenExecute(OnDismissAction action, @Nullable Runnable cancel,

            boolean afterKeyguardGone);

            boolean afterKeyguardGone);





    /** Authenticates if needed and dismisses keyguard to execute an action. */

    void dismissKeyguardThenExecute(OnDismissAction action, @Nullable Runnable cancel,

            boolean afterKeyguardGone, @Nullable String customMessage);



    interface Callback {

    interface Callback {

        void onActivityStarted(int resultCode);

        void onActivityStarted(int resultCode);

    }

    }

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -3069,6 +3069,9 @@ 
    -->

    -->

    <string name="lock_screen_settings">Customize lock screen</string>

    <string name="lock_screen_settings">Customize lock screen</string>





    <!-- Title of security view when we want to authenticate before customizing the lockscreen. [CHAR LIMIT=NONE] -->

    <string name="keyguard_unlock_to_customize_ls">Unlock to customize lock screen</string>



    <!-- Content description for Wi-Fi not available icon on dream [CHAR LIMIT=NONE]-->

    <!-- Content description for Wi-Fi not available icon on dream [CHAR LIMIT=NONE]-->

    <string name="wifi_unavailable_dream_overlay_content_description">Wi-Fi not available</string>

    <string name="wifi_unavailable_dream_overlay_content_description">Wi-Fi not available</string>

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputViewController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -116,7 +116,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
    }

    }





    @Override

    @Override

    public void showMessage(CharSequence message, ColorStateList colorState) {

    public void showMessage(CharSequence message, ColorStateList colorState, boolean animated) {

        if (mMessageAreaController == null) {

        if (mMessageAreaController == null) {

            return;

            return;

        }

        }
@@ -124,7 +124,7 @@ public abstract class KeyguardAbsKeyInputViewController<T extends KeyguardAbsKey 
        if (colorState != null) {

        if (colorState != null) {

            mMessageAreaController.setNextMessageColor(colorState);

            mMessageAreaController.setNextMessageColor(colorState);

        }

        }

        mMessageAreaController.setMessage(message);

        mMessageAreaController.setMessage(message, animated);

    }

    }





    // Allow subclasses to override this behavior

    // Allow subclasses to override this behavior

packages/SystemUI/src/com/android/keyguard/KeyguardInputViewController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ public abstract class KeyguardInputViewController<T extends KeyguardInputView> 
    }

    }





    @Override

    @Override

    public void showMessage(CharSequence message, ColorStateList colorState) {

    public void showMessage(CharSequence message, ColorStateList colorState, boolean animated) {

    }

    }





    public void startAppearAnimation() {

    public void startAppearAnimation() {

packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -333,14 +333,14 @@ public class KeyguardPatternViewController 
    }

    }





    @Override

    @Override

    public void showMessage(CharSequence message, ColorStateList colorState) {

    public void showMessage(CharSequence message, ColorStateList colorState, boolean animated) {

        if (mMessageAreaController == null) {

        if (mMessageAreaController == null) {

            return;

            return;

        }

        }

        if (colorState != null) {

        if (colorState != null) {

            mMessageAreaController.setNextMessageColor(colorState);

            mMessageAreaController.setNextMessageColor(colorState);

        }

        }

        mMessageAreaController.setMessage(message);

        mMessageAreaController.setMessage(message, animated);

    }

    }





    @Override

    @Override