frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am bf19fa4f: Merge "Move bouncer to the bottom, but only on phones."	Jorim Jaggi	2014-04-17	3	-3/+31
\|\
\| *	Move bouncer to the bottom, but only on phones.	Jorim Jaggi	2014-04-17	3	-3/+31
* \|	am b91dfd95: Merge "Fix not being able to unlock SIM PIN."	Jorim Jaggi	2014-04-17	2	-22/+22
\|\ \ \| \|/
\| *	Merge "Fix not being able to unlock SIM PIN."	Jorim Jaggi	2014-04-17	2	-22/+22
\| \|\
\| \| *	Fix not being able to unlock SIM PIN.	Jorim Jaggi	2014-04-17	2	-22/+22
\| * \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-04-16	56	-2/+59
\| \|/
* \|	am 3d72c067: Merge "Remove activitystrings.xml from localized resource direct...	Baligh Uddin	2014-04-16	45	-1620/+0
\|\ \ \| \|/
\| *	Merge "Remove activitystrings.xml from localized resource directories"	Baligh Uddin	2014-04-16	45	-1620/+0
\| \|\
\| \| *	Remove activitystrings.xml from localized resource directories	Baligh Uddin	2014-04-16	45	-1620/+0
\| * \|	Merge "Revert "Import translations. DO NOT MERGE""	Baligh Uddin	2014-04-16	56	-84/+0
\| \|\ \
\| \| * \|	Revert "Import translations. DO NOT MERGE"	Baligh Uddin	2014-04-16	56	-84/+0
\| * \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2014-04-16	56	-0/+84
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-04-14	56	-0/+84
\| \| \|/
* \| \|	resolved conflicts for merge of 352e1082 to master-nova	Evan Charlton	2014-04-14	22	-51/+76
\|\ \ \ \| \|/ /
\| * \|	am ae3f7cca: Merge "Add app_name to keyguard package."	John Spurlock	2014-04-11	1	-0/+2
\| \|\ \ \| \| \|/
\| * \|	Basic implementation for notifications on lockscreen.	Jorim Jaggi	2014-04-05	4	-33/+28
\| * \|	am b325345e: Merge "Switch framework Holo references to Quantum.Light"	Alan Viverette	2014-04-02	1	-1/+1
\| \|\ \
\| * \| \|	Switch to KeyguardHostView to reenable clock and multi user switch.	Jorim Jaggi	2014-03-31	1	-1/+1
\| * \| \|	Reuse KeyguardViewMediator for new Keyguard implementation.	Jorim Jaggi	2014-03-31	1	-0/+30
\| * \| \|	Make Keyguard a library and make StatusBar the new Keyguard.	Jorim Jaggi	2014-03-28	19	-19/+19
* \| \| \|	am ae3f7cca: Merge "Add app_name to keyguard package."	John Spurlock	2014-04-11	1	-0/+2
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Add app_name to keyguard package.	John Spurlock	2014-04-10	1	-0/+2
\| * \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2014-04-04	1	-1/+1
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-04-02	1	-1/+1
* \| \| \|	am b325345e: Merge "Switch framework Holo references to Quantum.Light"	Alan Viverette	2014-04-02	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Switch framework Holo references to Quantum.Light	Alan Viverette	2014-04-01	1	-1/+1
\| \|/ /
\| * \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-03-24	1	-1/+1
\| \|/
\| *	Import translations. DO NOT MERGE	Geoff Mendal	2014-03-17	1	-1/+1
\| *	Import translations. DO NOT MERGE	Baligh Uddin	2014-02-26	1	-1/+1
\|/
*	Fix boot crash on devices defaulting to landscape.	Dan Sandler	2014-02-25	1	-0/+49
*	Import translations. DO NOT MERGE	Baligh Uddin	2014-02-10	1	-1/+1
*	Add KeyguardSimpleHostView and make it the default	Jim Miller	2014-02-06	1	-0/+49
*	Import translations. DO NOT MERGE	Baligh Uddin	2014-01-29	1	-4/+4
*	Import translations. DO NOT MERGE	Baligh Uddin	2013-12-26	1	-1/+1
*	Import translations. DO NOT MERGE	Baligh Uddin	2013-12-16	1	-1/+1
*	Remove deprecated locales	Baligh Uddin	2013-12-09	11	-1242/+0
*	Import translations. DO NOT MERGE	Geoff Mendal	2013-11-27	1	-1/+1
*	am c9fd186b: am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into...	Jim Miller	2013-11-08	2	-1/+64
\|\
\| *	am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev	Jim Miller	2013-11-08	2	-1/+64
\| \|\
\| \| *	am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev	Jim Miller	2013-11-08	2	-1/+64
\| \| \|\
\| \| \| *	Show keyguard scrim on external displays while keyguard showing	Jim Miller	2013-11-07	2	-1/+64
\| \| \| *	Import translations. DO NOT MERGE	Baligh Uddin	2013-11-04	10	-43/+43
* \| \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2013-11-05	10	-43/+43
\|\ \ \ \
\| * \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-11-04	10	-43/+43
* \| \| \| \|	am e63d6b40: am 459f844e: am cd4919c0: Merge "Compose singleLine & textAllCap...	Victoria Lease	2013-11-04	1	-3/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	am 459f844e: am cd4919c0: Merge "Compose singleLine & textAllCaps transforms"...	Victoria Lease	2013-11-04	1	-3/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am cd4919c0: Merge "Compose singleLine & textAllCaps transforms" into klp-dev	Victoria Lease	2013-11-04	1	-3/+1
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Compose singleLine & textAllCaps transforms	Victoria Lease	2013-11-01	1	-3/+1
\| \| \| *	Import translations. DO NOT MERGE	Baligh Uddin	2013-10-30	30	-532/+448
* \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-10-30	30	-532/+448