frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD	Bill Yi	2014-04-29	2	-32/+46
\|\
\| *	am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73:...	Craig Mautner	2014-03-25	1	-5/+9
\| \|\
\| \| *	am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec:...	Craig Mautner	2014-03-25	1	-5/+9
\| \| \|\
\| \| \| *	am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e:...	Craig Mautner	2014-03-25	1	-5/+9
\| \| \| \|\
\| \| \| \| *	am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow...	Craig Mautner	2014-03-25	1	-5/+9
\| \| \| \| \|\
\| \| \| \| \| *	am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-...	Craig Mautner	2014-03-25	1	-5/+9
\| \| \| \| \| \|\
\| \| \| \| \| \| *	Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs	Craig Mautner	2014-03-22	1	-5/+9
\| \| \| \| * \| \|	am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE...	Adrian Roos	2014-03-18	1	-11/+12
\| \| \| \| \|\ \ \ \| \| \| \| \| \|/ /
\| \| \| \| \| * \|	am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug	Adrian Roos	2014-03-18	1	-11/+12
\| \| \| \| \| \|\ \ \| \| \| \| \| \| \|/
\| \| \| \| \| \| *	DO NOT MERGE - Fix keyguard pattern lockout bug	Adrian Roos	2014-03-18	1	-11/+12
\| * \| \| \| \| \|	am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge	Craig Mautner	2014-03-14	1	-12/+16
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge commit '3b9de0a4' into manualmerge	Craig Mautner	2014-03-13	1	-12/+16
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Resolved conflicts for merge of ad63d914 to jb-mr2-dev	Craig Mautner	2014-03-13	1	-25/+34
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / /
\| \| \| \| * \| \|	am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the key...	Craig Mautner	2014-03-13	1	-24/+33
\| \| \| \| \|\ \ \ \| \| \| \| \| \|/ /
\| \| \| \| \| * \|	am 1f52437d: Show the keyguard if unsecure window on top	Craig Mautner	2014-03-13	1	-24/+33
\| \| \| \| \| \|\ \ \| \| \| \| \| \| \|/
\| \| \| \| \| \| *	Show the keyguard if unsecure window on top	Craig Mautner	2014-03-12	1	-24/+33
\| * \| \| \| \| \|	am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen i...	Jeff Brown	2014-03-13	1	-1/+1
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	am 9bf7f893: am 93df07a1: Merge "Show the keyguard if unsecure window on top....	Craig Mautner	2014-03-08	1	-24/+31
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev	Craig Mautner	2014-03-07	1	-24/+31
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Show the keyguard if unsecure window on top. DO NOT MERGE.	Craig Mautner	2014-03-07	1	-24/+31
\| * \| \| \| \| \| \| \|	am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui flag...	John Spurlock	2014-03-04	1	-9/+7
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Merge "Volume panel should not clear system ui flags." into klp-dev	John Spurlock	2014-03-04	1	-9/+7
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Volume panel should not clear system ui flags.	John Spurlock	2014-03-04	1	-9/+7
\| \| \| \|/ / / / / /
\| * \| \| \| \| \| \| \|	am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into...	John Spurlock	2014-03-04	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Show hideycling for non-primary users.	John Spurlock	2014-03-04	1	-0/+1
\| \| \|/ / / / / /
* \| \| \| \| \| \| \|	GlobalActions: Fix Airplane Mode on/off issue	nagarw	2014-03-28	1	-3/+4
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Hang off call by power button while screen is on	shower	2014-01-03	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and sec...	Jim Miller	2013-11-13	1	-0/+8
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Report keyguard as initially showing and secure until we know	Jim Miller	2013-11-13	1	-0/+8
* \| \| \| \| \|	am da721a99: am 778eaf4b: Merge "Disallow transient status bar on the keyguar...	John Spurlock	2013-11-11	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Disallow transient status bar on the keyguard.	John Spurlock	2013-11-11	1	-0/+5
* \| \| \| \| \|	am 94cab389: am 1e45fd78: Merge "Fix improperly hidden status bar." into klp-dev	John Spurlock	2013-11-07	2	-10/+16
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Fix improperly hidden status bar.	John Spurlock	2013-11-07	2	-10/+16
* \| \| \| \| \|	am 8ed10cff: am def34eb7: Merge "Ensure bar window state is SHOWING after rot...	Craig Mautner	2013-11-06	1	-3/+7
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Ensure bar window state is SHOWING after rotate if visible.	John Spurlock	2013-11-06	1	-3/+7
* \| \| \| \| \|	am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar a...	Craig Mautner	2013-10-30	1	-1/+9
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Force relayout at completion of status bar animation	Craig Mautner	2013-10-29	1	-1/+9
* \| \| \| \| \|	am 7539a5af: am 2f566900: Merge "Ensure the simple CAB appears below the stat...	John Spurlock	2013-10-23	1	-6/+62
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Ensure the simple CAB appears below the status bar.	John Spurlock	2013-10-22	1	-6/+62
* \| \| \| \| \|	am 1eeb5ff2: am d4595bd1: Merge "Move the IME navigation guard view up to dec...	John Spurlock	2013-10-19	1	-0/+32
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Move the IME navigation guard view up to decor.	John Spurlock	2013-10-18	1	-0/+32
* \| \| \| \| \|	am 0945bc15: am ac2d61a2: Merge "Do not show immersive mode help in touch exp...	John Spurlock	2013-10-18	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Do not show immersive mode help in touch exploration mode." into klp-dev	John Spurlock	2013-10-18	1	-1/+2
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Do not show immersive mode help in touch exploration mode.	Daniel Sandler	2013-10-18	1	-1/+2
* \| \| \| \| \| \|	am 62c19871: am da35dded: Relayout the immersive cling in the correct thread.	Daniel Sandler	2013-10-18	1	-3/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Relayout the immersive cling in the correct thread.	Daniel Sandler	2013-10-18	1	-3/+10
\| \|/ / / / /
* \| \| \| \| \|	am 01491271: am 53cb242f: Merge "Fix issue where keyguard adds widgets before...	Jim Miller	2013-10-17	3	-0/+22
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Fix issue where keyguard adds widgets before the system is ready	Jim Miller	2013-10-16	3	-0/+22
* \| \| \| \| \|	am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." in...	Craig Mautner	2013-10-14	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Move the wallpaper beneath the keyguard." into klp-dev	Craig Mautner	2013-10-14	1	-1/+2
\| \|\ \ \ \ \