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

Commit 8c2b879a authored by Jeffrey Carlyle's avatar Jeffrey Carlyle Committed by Automerger Merge Worker
Browse files

Merge "allow KeyguardIndicationController to be more easily overriden" into... 

Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev am: b1012032

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12153272

Change-Id: I8114ca144e0981d3180d2fbca4bfb0920ac52281
parents 922fdf2f b1012032

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+2 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class KeyguardIndicationController implements StateListener, 
     * Creates a new KeyguardIndicationController and registers callbacks.

     */

    @Inject

    KeyguardIndicationController(Context context,

    public KeyguardIndicationController(Context context,

            WakeLock.Builder wakeLockBuilder,

            KeyguardStateController keyguardStateController,

            StatusBarStateController statusBarStateController,
@@ -523,8 +523,7 @@ public class KeyguardIndicationController implements StateListener, 
                });

    }



    @VisibleForTesting

    String computePowerIndication() {

    protected String computePowerIndication() {

        if (mPowerCharged) {

            return mContext.getResources().getString(R.string.keyguard_charged);

        }