Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev (b1012032) · Commits · e / os / android_frameworks_base

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