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

This commit is contained in:
Jeffrey Carlyle
2020-08-14 02:32:06 +00:00
committed by Android (Google) Code Review

View File

@@ -140,7 +140,7 @@ public class KeyguardIndicationController implements StateListener,
* Creates a new KeyguardIndicationController and registers callbacks. * Creates a new KeyguardIndicationController and registers callbacks.
*/ */
@Inject @Inject
KeyguardIndicationController(Context context, public KeyguardIndicationController(Context context,
WakeLock.Builder wakeLockBuilder, WakeLock.Builder wakeLockBuilder,
KeyguardStateController keyguardStateController, KeyguardStateController keyguardStateController,
StatusBarStateController statusBarStateController, StatusBarStateController statusBarStateController,
@@ -523,8 +523,7 @@ public class KeyguardIndicationController implements StateListener,
}); });
} }
@VisibleForTesting protected String computePowerIndication() {
String computePowerIndication() {
if (mPowerCharged) { if (mPowerCharged) {
return mContext.getResources().getString(R.string.keyguard_charged); return mContext.getResources().getString(R.string.keyguard_charged);
} }