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

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

Change-Id: I8114ca144e0981d3180d2fbca4bfb0920ac52281
This commit is contained in:
Jeffrey Carlyle
2020-08-14 03:03:21 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}