frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am c2a0b448: resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp	Neil Fuller	2014-10-02	1	-3/+2
\|\
\| *	resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp	Neil Fuller	2014-10-02	1	-3/+2
\| \|\
\| \| *	Switch from FloatMath -> Math and Math.hypot where possible	Neil Fuller	2014-10-01	1	-3/+2
\| \| *	We need to specify a target SDK < 21 to use graphics RS.	Stephen Hines	2014-08-22	2	-1/+2
\| \| *	am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities...	Steve Moyer	2014-03-16	2	-10/+12
\| \| \|\
\| \| * \	am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo mo...	John Spurlock	2014-03-07	4	-0/+411
\| \| \|\ \
* \| \| \ \	am d8e94409: am 49049aef: am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw...	wsmlby	2014-10-02	1	-6/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" int...	wsmlby	2014-10-01	1	-6/+2
\| \|\ \ \ \
\| \| * \| \| \|	Throw error when no intent can be found	wsmlby	2014-10-01	1	-6/+2
* \| \| \| \| \|	am e18d68d6: am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Rever...	Adam Powell	2014-10-02	3	-28/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined...	Adam Powell	2014-10-01	3	-28/+5
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Revert "Fix issue with using locally defined attrs in a shared lib"	Adam Powell	2014-10-01	3	-28/+5
* \| \| \| \| \| \|	am 043c4b35: am 51ec33bb: am 2298938c: Merge "More test cases from UX team fo...	ztenghui	2014-10-02	48	-2/+1509
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge "More test cases from UX team for AVD." into lmp-mr1-dev	ztenghui	2014-10-01	48	-2/+1509
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	More test cases from UX team for AVD.	ztenghui	2014-09-30	48	-2/+1509
\| \| \|/ / / /
* \| \| \| \| \|	am 7923da5f: am 06f380e9: am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix i...	Adam Lesinski	2014-10-01	3	-5/+28
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Fix issue with using locally defined attrs in a shared lib	Adam Lesinski	2014-09-30	3	-5/+28
\| \|/ / / /
* \| \| \| \|	am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow...	RoboErik	2014-09-26	1	-0/+12
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Allow null queues to be set in MediaSession" into lmp-dev	RoboErik	2014-09-25	1	-0/+12
\| \|\ \ \ \
\| \| * \| \| \|	Allow null queues to be set in MediaSession	RoboErik	2014-09-24	1	-0/+12
* \| \| \| \| \|	am e7b9e3c6: am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add o...	ztenghui	2014-09-25	4	-17/+136
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Add one more test and update old tests" into lmp-dev	ztenghui	2014-09-24	4	-17/+136
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Add one more test and update old tests	ztenghui	2014-09-23	4	-17/+136
* \| \| \| \| \|	am 1dbd1440: am 2129bb01: am 657bd7ec: am fa3089f8: am 0d18d08d: Merge "Work ...	Dianne Hackborn	2014-09-24	1	-0/+14
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Work on issue #17628623: Need to update default preferred activities f...	Dianne Hackborn	2014-09-24	1	-0/+14
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Work on issue #17628623: Need to update default preferred activities for YouTube	Dianne Hackborn	2014-09-23	1	-0/+14
\| \| \|/ / / /
* \| \| \| \| \|	am e15e5958: am 2b7813c6: am 065502cb: am 892412af: am 8518c090: Merge "Fix a...	ztenghui	2014-09-23	2	-1/+31
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Fix animation on the some properties	ztenghui	2014-09-23	2	-1/+31
\| \|/ / / /
* \| \| \| \|	am 462f7a65: am 5ef3b577: am d357ec8b: am 4746e825: am fa3fb593: Merge "Add l...	wsmlby	2014-09-19	3	-5/+11
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Add leanback support to AppCompatiblityTest	wsmlby	2014-09-18	3	-5/+11
* \| \| \| \|	am 75145fd6: am 8207e209: am 2bb77b5a: Merge "Add root alpha and animation to...	ztenghui	2014-09-13	4	-1/+33
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-dev	ztenghui	2014-09-12	4	-1/+33
\| \|\ \ \ \
\| \| * \| \| \|	Add root alpha and animation to (Animated)VectorDrawable	ztenghui	2014-09-12	4	-1/+33
* \| \| \| \| \|	am 0f169c8a: am d02321d5: am 2e35ab0a: Merge "UsageStats should deal with cha...	Adam Lesinski	2014-09-12	1	-1/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "UsageStats should deal with changing time" into lmp-dev	Adam Lesinski	2014-09-12	1	-1/+4
\| \|\ \ \ \ \
\| \| * \| \| \| \|	UsageStats should deal with changing time	Adam Lesinski	2014-09-11	1	-1/+4
* \| \| \| \| \| \|	am f015309d: am 79870899: am 44c97df3: Change constant to PowerManager.RELEAE...	Michael Wright	2014-09-12	1	-4/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY	Michael Wright	2014-09-12	1	-4/+5
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for j...	Matthew Williams	2014-09-12	1	-3/+8
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Add flag to JobParameters for job expired" into lmp-dev	Matthew Williams	2014-09-11	1	-3/+8
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add flag to JobParameters for job expired	Matthew Williams	2014-09-10	1	-3/+8
\| \| \|/ / / /
* \| \| \| \| \|	am 85c9f80a: am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and st...	ztenghui	2014-09-12	2	-3/+6
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Bring back the fillAlpha and strokeAlpha.	ztenghui	2014-09-10	2	-3/+6
\| \|/ / / /
* \| \| \| \|	am 55a572be: am 3e27567c: am d1ed1e81: Merge "Fix AppCompatibility test for d...	wsmlby	2014-09-10	1	-0/+6
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Fix AppCompatibility test for different process name of one package." ...	wsmlby	2014-09-10	1	-0/+6
\| \|\ \ \ \
\| \| * \| \| \|	Fix AppCompatibility test for different process name of one package.	wsmlby	2014-09-09	1	-0/+6
* \| \| \| \| \|	am 37af2b51: am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unus...	Craig Mautner	2014-09-09	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Remove deprecated (and now unused) API method." into lmp-dev	Craig Mautner	2014-09-09	1	-1/+1
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Remove deprecated (and now unused) API method.	Craig Mautner	2014-09-09	1	-1/+1
* \| \| \| \| \| \|	am 1420cfbf: am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for ...	Dianne Hackborn	2014-09-09	12	-0/+831
\|\ \ \ \ \ \ \ \| \|/ / / / / /