frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \|	Force status bar showing when Keyguard is showing.	Jorim Jaggi	2014-04-08	1	-0/+4
* \| \| \|	am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions."	George Mount	2014-04-07	1	-4/+56
\|\ \ \ \ \| \|/ / /
\| * \| \|	Add Transitions useful for Activity transitions.	George Mount	2014-04-07	1	-4/+56
* \| \| \|	am dde10d07: Merge "Implement "Back" for Activity Transitions."	George Mount	2014-04-07	1	-96/+324
\|\ \ \ \ \| \|/ / /
\| * \| \|	Implement "Back" for Activity Transitions.	George Mount	2014-04-07	1	-96/+324
* \| \| \|	am 43c290f0: Tint more icons, fix dialog styles and headers	Alan Viverette	2014-04-04	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Tint more icons, fix dialog styles and headers	Alan Viverette	2014-04-04	1	-1/+1
* \| \| \|	Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev	Jorim Jaggi	2014-04-02	1	-12/+28
\|\ \ \ \
\| * \| \| \|	Wait for Keyguard to be drawn after boot.	Jorim Jaggi	2014-04-02	1	-12/+28
* \| \| \| \|	am 74ee938d: resolved conflicts for merge of ffb22827 to master	Craig Mautner	2014-04-01	1	-3/+3
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	resolved conflicts for merge of ffb22827 to master	Craig Mautner	2014-04-01	1	-3/+3
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e...	Craig Mautner	2014-04-01	1	-5/+4
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev	Craig Mautner	2014-04-01	1	-5/+4
\| \| \| \|\ \
\| \| \| \| * \	resolved conflicts for merge of 8c6e6e73 to klp-dev	Craig Mautner	2014-04-01	1	-5/+4
\| \| \| \| \|\ \
\| \| \| \| \| * \	am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb:...	Craig Mautner	2014-04-01	1	-3/+3
\| \| \| \| \| \|\ \
\| \| \| \| \| \| * \	am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DIS...	Craig Mautner	2014-04-01	1	-3/+3
\| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| * \	am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working	Craig Mautner	2014-04-01	1	-3/+3
\| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| * \|	Fix FLAG_DISMISS_KEYGUARD not working	Craig Mautner	2014-04-01	1	-3/+3
* \| \| \| \| \| \| \| \| \|	am 4bb047fa: Fix build after bad merge resolution	Michael Kolb	2014-04-01	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Fix build after bad merge resolution	Michael Kolb	2014-04-01	1	-0/+1