frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Add overflow menu popup for Action Bar in Layoutlib"	Deepanshu Gupta	2014-04-14	5	-93/+385
\|\
\| *	Add overflow menu popup for Action Bar in Layoutlib	Deepanshu Gupta	2014-04-14	5	-93/+385
* \|	Merge "Action bar rendering in layoutlib"	Deepanshu Gupta	2014-04-14	10	-145/+429
\|\ \ \| \|/
\| *	Action bar rendering in layoutlib	Deepanshu Gupta	2014-04-10	10	-145/+429
* \|	Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"	Dan Sandler	2014-04-14	1	-2/+10
\|\ \
\| * \	am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage.	Narayan Kamath	2014-04-11	1	-1/+1
\| \|\ \
\| * \ \	resolved conflicts for merge of 90b39aba to master-lockscreen-dev	Colin Cross	2014-04-10	1	-2/+2
\| \|\ \ \
\| * \ \ \	resolved conflicts for merge of 6be2f952 to master-lockscreen-dev	Svetoslav	2014-04-10	1	-10/+15
\| \|\ \ \ \
\| * \ \ \ \	am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib"	Deepanshu Gupta	2014-04-10	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	am 733217e6: Merge "Update layoutlib create README"	Deepanshu Gupta	2014-04-09	1	-138/+128
\| \|\ \ \ \ \
\| * \ \ \ \ \	am 6e5e160f: Merge "Make layoutlib load on Java 7 VM"	Deepanshu Gupta	2014-04-09	2	-1/+12
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	am 30f05c29: Merge "Fix sdk build."	Ying Wang	2014-04-08	1	-0/+5
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	am e9abc279: Merge "Fix theme/style resolution in Layoutlib"	Deepanshu Gupta	2014-04-07	4	-14/+145
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	am 1cb3e814: Merge "Fix sdk build"	Deepanshu Gupta	2014-04-05	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATC...	John Spurlock	2014-04-04	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev	Jorim Jaggi	2014-04-02	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Wait for Keyguard to be drawn after boot.	Jorim Jaggi	2014-04-02	1	-0/+4
* \| \| \| \| \| \| \| \| \| \| \| \|	am eaa8a6b7: am a5c8d586: Fix build break due to layout lib.	Jeff Brown	2014-04-12	1	-5/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	am a5c8d586: Fix build break due to layout lib.	Jeff Brown	2014-04-12	1	-5/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix build break due to layout lib.	Jeff Brown	2014-04-11	1	-5/+0
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO ...	Deepanshu Gupta	2014-04-12	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-04-12	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Add DatePickerDialog to layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-04-10	1	-0/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 73e78c75: am af42a91c: Fix another build breakage.	Narayan Kamath	2014-04-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am af42a91c: Fix another build breakage.	Narayan Kamath	2014-04-11	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix another build breakage.	Narayan Kamath	2014-04-11	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \|	fix build	Colin Cross	2014-04-10	1	-2/+2
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Adding render stats APIs to UiAutomation (framework)."	Svetoslav	2014-04-10	1	-11/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Adding render stats APIs to UiAutomation (framework).	Svetoslav	2014-04-07	1	-11/+12
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Support custom views using TimePickerDialog in layoutlib	Deepanshu Gupta	2014-04-09	1	-0/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge "Update layoutlib create README"	Deepanshu Gupta	2014-04-08	1	-138/+128
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update layoutlib create README	Deepanshu Gupta	2014-04-08	1	-138/+128
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge "Make layoutlib load on Java 7 VM"	Deepanshu Gupta	2014-04-08	2	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make layoutlib load on Java 7 VM	Deepanshu Gupta	2014-04-08	2	-1/+12
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Fix sdk build.	Ying Wang	2014-04-08	1	-0/+5
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge "Fix theme/style resolution in Layoutlib"	Deepanshu Gupta	2014-04-07	4	-14/+145
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix theme/style resolution in Layoutlib	Deepanshu Gupta	2014-04-04	4	-14/+145
* \| \| \| \| \| \| \|	Fix sdk build	Deepanshu Gupta	2014-04-04	1	-0/+5
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifi...	John Spurlock	2014-04-04	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp...	John Spurlock	2014-04-04	1	-0/+5
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev	John Spurlock	2014-04-04	1	-0/+5
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Introduce new UI_MODE_TYPE_WATCH and qualifier.	John Spurlock	2014-04-04	1	-0/+5
\| * \| \| \| \| \|	am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layou...	Xavier Ducrohet	2014-04-03	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build fi...	Xavier Ducrohet	2014-04-03	1	-0/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| / / \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| * \| \|	Add missing dependency in layoutlib build file [DO NOT MERGE]	Deepanshu Gupta	2014-03-31	1	-0/+1
\| * \| \| \| \|	am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"	Adam Lesinski	2014-03-27	4	-92/+98
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Reduce warning verbosity in aapt	Adam Lesinski	2014-03-24	4	-92/+98
* \| \| \| \| \| \|	Add stub getThemeAttributeId() to BridgeTypedArray	Deepanshu Gupta	2014-04-01	1	-8/+15
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge "Fix visitFieldInsn in layoutlib_create."	Deepanshu Gupta	2014-04-01	6	-7/+36
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix visitFieldInsn in layoutlib_create.	Deepanshu Gupta	2014-03-31	6	-7/+36
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|