Merge "Keyguard: Fix typos in documentation." (b7438b6d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+32 −32

Original line number	Original line	Diff line number	Diff line
	@@ -138,7 +138,7 @@ import dagger.Lazy;
	* state of the keyguard, power management events that effect whether the keyguard		* state of the keyguard, power management events that effect whether the keyguard
	* should be shown or reset, callbacks to the phone window manager to notify		* should be shown or reset, callbacks to the phone window manager to notify
	* it of when the keyguard is showing, and events from the keyguard view itself		* it of when the keyguard is showing, and events from the keyguard view itself
	* stating that the keyguard was succesfully unlocked.		* stating that the keyguard was successfully unlocked.
	*		*
	* Note that the keyguard view is shown when the screen is off (as appropriate)		* Note that the keyguard view is shown when the screen is off (as appropriate)
	* so that once the screen comes on, it will be ready immediately.		* so that once the screen comes on, it will be ready immediately.
	@@ -152,15 +152,15 @@ import dagger.Lazy;
	* - the keyguard is showing		* - the keyguard is showing
	*		*
	* Example external events that translate to keyguard view changes:		* Example external events that translate to keyguard view changes:
	* - screen turned off -> reset the keyguard, and show it so it will be ready		* - screen turned off -> reset the keyguard, and show it, so it will be ready
	* next time the screen turns on		* next time the screen turns on
	* - keyboard is slid open -> if the keyguard is not secure, hide it		* - keyboard is slid open -> if the keyguard is not secure, hide it
	*		*
	* Events from the keyguard view:		* Events from the keyguard view:
	* - user succesfully unlocked keyguard -> hide keyguard view, and no longer		* - user successfully unlocked keyguard -> hide keyguard view, and no longer
	* restrict input events.		* restrict input events.
	*		*
	* Note: in addition to normal power managment events that effect the state of		* Note: in addition to normal power management events that effect the state of
	* whether the keyguard should be showing, external apps and services may request		* whether the keyguard should be showing, external apps and services may request
	* that the keyguard be disabled via {@link #setKeyguardEnabled(boolean)}. When		* that the keyguard be disabled via {@link #setKeyguardEnabled(boolean)}. When
	* false, this will override all other conditions for turning on the keyguard.		* false, this will override all other conditions for turning on the keyguard.
	@@ -224,7 +224,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
	/**		/**
	* How long we'll wait for the {@link ViewMediatorCallback#keyguardDoneDrawing()}		* How long we'll wait for the {@link ViewMediatorCallback#keyguardDoneDrawing()}
	* callback before unblocking a call to {@link #setKeyguardEnabled(boolean)}		* callback before unblocking a call to {@link #setKeyguardEnabled(boolean)}
	* that is reenabling the keyguard.		* that is re-enabling the keyguard.
	*/		*/
	private static final int KEYGUARD_DONE_DRAWING_TIMEOUT_MS = 2000;		private static final int KEYGUARD_DONE_DRAWING_TIMEOUT_MS = 2000;

	@@ -273,14 +273,14 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
	// these are protected by synchronized (this)		// these are protected by synchronized (this)

	/**		/**
	* External apps (like the phone app) can tell us to disable the keygaurd.		* External apps (like the phone app) can tell us to disable the keyguard.
	*/		*/
	private boolean mExternallyEnabled = true;		private boolean mExternallyEnabled = true;