frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Add System UI Color API"	Adrian Roos	2014-05-15	1	-0/+18
\|\
\| *	Add System UI Color API	Adrian Roos	2014-05-15	1	-0/+18
* \|	am 8b2e7c4a: am 0ade263c: Merge "If there is only 1 simple global action, aut...	Justin Koh	2014-05-15	1	-6/+13
\|\ \ \| \|/ \|/\|
\| *	am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" i...	Justin Koh	2014-05-15	1	-6/+13
\| \|\
\| \| *	Merge "If there is only 1 simple global action, autolaunch it" into klp-modul...	Justin Koh	2014-05-15	1	-6/+13
\| \| \|\
\| \| \| *	If there is only 1 simple global action, autolaunch it	Justin Koh	2014-05-14	1	-6/+13
* \| \| \|	Merge "AlertDialog and AppError themes for TV."	Craig Stout	2014-05-14	1	-3/+10
\|\ \ \ \
\| * \| \| \|	AlertDialog and AppError themes for TV.	Craig Stout	2014-05-13	1	-3/+10
* \| \| \| \|	am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for ...	Aaron Whyte	2014-05-13	1	-0/+6
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Ma...	Aaron Whyte	2014-05-13	1	-0/+6
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.	Aaron Whyte	2014-05-12	1	-0/+6
* \| \| \| \|	am d67fd642: am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGR...	Aaron Whyte	2014-05-13	1	-5/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clock...	Aaron Whyte	2014-05-13	1	-5/+0
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherA...	Aaron Whyte	2014-05-13	1	-5/+0
* \| \| \| \|	am 064789ef: am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for ...	Aaron Whyte	2014-05-13	1	-0/+5
\|\ \ \ \ \ \| \|/ / / / \| \| \| / / \| \|_\|/ / \|/\| \| \|
\| * \| \|	am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Ma...	Aaron Whyte	2014-05-13	1	-0/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.	Aaron Whyte	2014-05-12	1	-0/+5
\| \| \|/
* \| \|	am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modu...	Adam Powell	2014-05-06	1	-9/+1
\|\ \ \ \| \|/ /
\| * \|	am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev	Adam Powell	2014-05-06	1	-9/+1
\| \|\ \ \| \| \|/
\| \| *	onWindowDismissed API cleanup	Adam Powell	2014-05-05	1	-9/+1
* \| \|	am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable....	Justin Koh	2014-05-02	1	-3/+4
\|\ \ \ \| \|/ /
\| * \|	am 60158445: Merge "Make global action key timeout configurable." into klp-mo...	Justin Koh	2014-05-02	1	-3/+4
\| \|\ \ \| \| \|/
\| \| *	Make global action key timeout configurable.	Justin Koh	2014-05-02	1	-3/+4
* \| \|	resolved conflicts for merge of 4f8cd188 to master	Jeff Brown	2014-05-01	1	-4/+4
\|\ \ \ \| \|/ /
\| * \|	am 7f6ab17d: Merge "Clean up some terminology related to interactive state." ...	Jeff Brown	2014-05-01	1	-4/+4
\| \|\ \ \| \| \|/
\| \| *	Merge "Clean up some terminology related to interactive state." into klp-modu...	Jeff Brown	2014-05-01	1	-4/+4
\| \| \|\
\| \| \| *	Clean up some terminology related to interactive state.	Jeff Brown	2014-05-01	1	-4/+4
* \| \| \|	am 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into k...	Vinod Krishnan	2014-05-01	1	-1/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev	Vinod Krishnan	2014-05-01	1	-1/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "DialogAlert window changes for Micro" into klp-modular-dev	Vinod Krishnan	2014-05-01	1	-1/+5
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	DialogAlert window changes for Micro	Vinod Krishnan	2014-04-28	1	-1/+5
* \| \| \|	am 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while ...	Mark Renouf	2014-05-01	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into...	Mark Renouf	2014-05-01	1	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SwipeDismiss: limit fade to 50% alpha while swiping	Mark Renouf	2014-05-01	1	-2/+2
\| \| \|/
* \| \|	Move key attribute information into KeyEvent.	Michael Wright	2014-04-28	1	-8/+2
* \| \|	resolved conflicts for merge of d90712d0 to master	Justin Koh	2014-04-22	1	-86/+139
\|\ \ \ \| \|/ /
\| * \|	am 3b9a3cc0: Update GlobalActions for watches.	Justin Koh	2014-04-22	1	-86/+139
\| \|\ \ \| \| \|/
\| \| *	Update GlobalActions for watches.	Justin Koh	2014-04-22	1	-86/+139
* \| \|	am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as tran...	Mindy Pereira	2014-04-17	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	am cb54f978: Merge "Update window alpha at the same time as translating" into...	Mindy Pereira	2014-04-17	1	-0/+2
\| \|\ \ \| \| \|/
\| \| *	Update window alpha at the same time as translating	Mindy Pereira	2014-04-17	1	-0/+2
* \| \|	Split Activity Transitions out of PhoneWindow.	George Mount	2014-04-17	1	-707/+125
* \| \|	am 26c6a50f: Rename isScreenOn() to isInteractive().	Jeff Brown	2014-04-11	1	-3/+3
\|\ \ \
\| * \| \|	Rename isScreenOn() to isInteractive().	Jeff Brown	2014-04-11	1	-3/+3
* \| \| \|	resolved conflicts for merge of 4e5c089e to master-lockscreen-dev	Jeff Brown	2014-04-11	1	-27/+18
\|\ \ \ \ \| \|/ / /
\| * \| \|	resolved conflicts for merge of 337e764d to master	Jeff Brown	2014-04-11	1	-27/+18
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am f24687e2: Merge "Plumb display power state through display manager." into ...	Jeff Brown	2014-04-11	1	-28/+19
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Plumb display power state through display manager.	Jeff Brown	2014-04-10	1	-28/+19
* \| \| \|	Protect WindowManager's PRIVATE_FLAG_KEYGUARD	Adrian Roos	2014-04-09	1	-0/+5
* \| \| \|	Make FLAG_SHOW_ON_LOCKSCREEN work again.	Jorim Jaggi	2014-04-09	1	-1/+0