android_packages_apps_Trebuchet - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*-.	Reconcile with jb-release nakasi-factoryrom-release	The Android Open Source Project	2012-05-18	0	-0/+0
\|\ \ \| \| \| \| \| \| \| \| \|	Change-Id: Ibfbde4f9437502df4a7580943f99ad13e427bdd5
\| \| *	merge in nakasi-factoryrom-release history after reset to jb-dev	The Android Automerger	2012-05-18	0	-0/+0
\| \| \|\
\| * \| \|	Updating launcher assets. (Bug 6499087)	Winson Chung	2012-05-18	27	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \|	Change-Id: I4d3593f969917c7b45eb48522ebcea1bc8bb0822
\| * \|	Change custom workspace cling	Andrew Flynn	2012-05-17	2	-20/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I8fe44469ac4bf38f9be2228d8eace1198bf3a48e
\| * \|	Fixing regression where you can't add shortcuts	Adam Cohen	2012-05-17	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2c91a9a5131591aa15319efdaf887f06fb593b08
\| * \|	Removing logging related to and fixing (issue 6238330)	Adam Cohen	2012-05-17	2	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7ed89840d90fd13cbfedc795e789706b32f76b5d
\| * \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-05-17	0	-0/+0
\| \|\ \
* \| \ \	am be4f1471: Merge "Fix incremental builds" into jb-dev	Michael Jurka	2012-05-18	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'be4f1471152ef1377ca7387b1ae0e9ee2ab108c4': Fix incremental builds
\| * \ \ \	Merge "Fix incremental builds" into jb-dev	Michael Jurka	2012-05-18	1	-0/+1
\| \|\ \ \ \
\| \| * \| \| \|	Fix incremental builds	Michael Jurka	2012-05-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iac9a31690ef5989b7b25282641345cf482d2170e
* \| \| \| \| \|	am cee461da: Merge "Add 1x1 transparent dummy img so we can reference ↵	Andrew Flynn	2012-05-18	1	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bg_cling5" into jb-dev * commit 'cee461daa1bfc6ea13f2be44b1dd4d8055cba749': Add 1x1 transparent dummy img so we can reference bg_cling5
\| * \| \| \| \|	Merge "Add 1x1 transparent dummy img so we can reference bg_cling5" into jb-dev	Andrew Flynn	2012-05-18	1	-0/+0
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add 1x1 transparent dummy img so we can reference bg_cling5	Andrew Flynn	2012-05-18	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(it's only used in overlays) Change-Id: I357bcabb4017f911a10d3cd6acc244608cc9d8b0
* \| \| \| \| \| \|	am 799e00f7: Merge "Use different cling for custom workspace" into jb-dev	Andrew Flynn	2012-05-18	1	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '799e00f71df331d2e715b8f2c167f945b07511b9': Use different cling for custom workspace
\| * \| \| \| \| \|	Merge "Use different cling for custom workspace" into jb-dev	Andrew Flynn	2012-05-18	1	-2/+3
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Use different cling for custom workspace	Andrew Flynn	2012-05-18	1	-2/+3
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I55c53439936d8c300fbb0718216d441f4bab4215
* \| \| \| \| \| \|	am 1d890971: Merge "sw600dp clings" into jb-dev	Andrew Flynn	2012-05-18	2	-0/+103
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '1d890971b4fa41b1d01f4967f5706497fa38fe58': sw600dp clings
\| * \| \| \| \| \|	Merge "sw600dp clings" into jb-dev	Andrew Flynn	2012-05-18	2	-0/+103
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	sw600dp clings	Andrew Flynn	2012-05-18	2	-0/+103
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Larger OK button * Expand text width in All Apps Change-Id: I98af5fadfc79da2313bdcabb201b5dc77bc1bf4f
* \| \| \| \| \|	am 907a6fc9: Merge "Updating launcher assets. (Bug 6499087)" into jb-dev	Winson Chung	2012-05-17	27	-0/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '907a6fc9d6c6bce4c7f8ddb6504e00ae6315c9b0': Updating launcher assets. (Bug 6499087)
\| * \| \| \| \|	Merge "Updating launcher assets. (Bug 6499087)" into jb-dev	Winson Chung	2012-05-17	27	-0/+0
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Updating launcher assets. (Bug 6499087)	Winson Chung	2012-05-17	27	-0/+0
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I4d3593f969917c7b45eb48522ebcea1bc8bb0822
* \| \| \| \|	am 7f47685e: Merge "Change custom workspace cling" into jb-dev	Andrew Flynn	2012-05-17	2	-20/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '7f47685e662aa4ba17c58d903bc474a35a730444': Change custom workspace cling
\| * \| \| \|	Merge "Change custom workspace cling" into jb-dev	Andrew Flynn	2012-05-17	2	-20/+6
\| \|\ \ \ \
\| \| * \| \| \|	Change custom workspace cling	Andrew Flynn	2012-05-17	2	-20/+6
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I8fe44469ac4bf38f9be2228d8eace1198bf3a48e
* \| \| \| \|	am 92478920: Fixing regression where you can\'t add shortcuts	Adam Cohen	2012-05-17	1	-8/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9247892015dad231c5005aa021c3e3416265ed80': Fixing regression where you can't add shortcuts
\| * \| \| \|	Fixing regression where you can't add shortcuts	Adam Cohen	2012-05-17	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2c91a9a5131591aa15319efdaf887f06fb593b08
* \| \| \| \|	am 263301a3: Removing logging related to and fixing (issue 6238330)	Adam Cohen	2012-05-17	2	-11/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '263301a391c5eaa7a1f651d79c79c863c60e496a': Removing logging related to and fixing (issue 6238330)
\| * \| \| \|	Removing logging related to and fixing (issue 6238330)	Adam Cohen	2012-05-17	2	-11/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7ed89840d90fd13cbfedc795e789706b32f76b5d
* \| \| \|	am 90340cf6: Adding logging for the bug that won\'t die (issue 6282761)	Adam Cohen	2012-05-16	1	-0/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '90340cf67aa413112eb1a697e301894a7e1a8a2a': Adding logging for the bug that won't die (issue 6282761)
\| * \| \|	Adding logging for the bug that won't die (issue 6282761)	Adam Cohen	2012-05-16	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2f10a3374c8646635f6f45d51e8ae2154706a680
* \| \| \|	am 3aff81c7: Tweak folder creation threshold (issue 6443778)	Adam Cohen	2012-05-16	1	-8/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3aff81c759a2912bed45643f7e1fb503fcfe69b0': Tweak folder creation threshold (issue 6443778)
\| * \| \|	Tweak folder creation threshold (issue 6443778)	Adam Cohen	2012-05-16	1	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7bd4ec5da5181032d2e0891a0ac8fca35454efa4
* \| \| \|	am 65dbf3e4: Merge "Updating search bar animation, and adding use of hw ↵	Michael Jurka	2012-05-16	2	-15/+29
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	layers." into jb-dev * commit '65dbf3e454a94869cf28a6bd349b40e8e79d1ccf': Updating search bar animation, and adding use of hw layers.
\| * \| \|	Merge "Updating search bar animation, and adding use of hw layers." into jb-dev	Michael Jurka	2012-05-16	2	-15/+29
\| \|\ \ \
\| \| * \| \|	Updating search bar animation, and adding use of hw layers.	Winson Chung	2012-05-16	2	-15/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ida06bb526876abc793366415df1e06f483f3b66c
* \| \| \| \|	am 4d173e93: Merge "Fix rendering bug while dragging" into jb-dev	Michael Jurka	2012-05-16	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '4d173e93f077bdbc855cd1ef388dea4e21a234d5': Fix rendering bug while dragging
\| * \| \| \|	Merge "Fix rendering bug while dragging" into jb-dev	Michael Jurka	2012-05-16	1	-0/+2
\| \|\ \ \ \
\| \| * \| \| \|	Fix rendering bug while dragging	Michael Jurka	2012-05-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 6500722 Change-Id: I231c2a87e65c44fca30e7867d9c29fd00faf2b26
* \| \| \| \| \|	am 534ea47f: Merge "Yet another attempt to fix (issue 6282761)" into jb-dev	Adam Cohen	2012-05-16	2	-1/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '534ea47ffd3a0c3c2e2c883200926393110d174c': Yet another attempt to fix (issue 6282761)
\| * \| \| \| \|	Merge "Yet another attempt to fix (issue 6282761)" into jb-dev	Adam Cohen	2012-05-16	2	-1/+7
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Yet another attempt to fix (issue 6282761)	Adam Cohen	2012-05-16	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iabb0dd8e59e566ddef71d4aa7aa684f52d06b3b3
* \| \| \| \| \| \|	am e8375ef5: Merge "Prevent multiple size changed callbacks to widgets ↵	Winson Chung	2012-05-16	2	-6/+22
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whenever we reload the workspace." into jb-dev * commit 'e8375ef55e7d196b98894f5cf6f479abc99188f5': Prevent multiple size changed callbacks to widgets whenever we reload the workspace.
\| * \| \| \| \| \|	Merge "Prevent multiple size changed callbacks to widgets whenever we reload ↵	Winson Chung	2012-05-16	2	-6/+22
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	the workspace." into jb-dev
\| \| * \| \| \| \|	Prevent multiple size changed callbacks to widgets whenever we reload the ↵	Winson Chung	2012-05-15	2	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	workspace. Change-Id: I54d7f54ba9ead36201cfaad36fbb234a4c119b20
* \| \| \| \| \| \|	am 9218d811: Tweaking AllApps cell size. (Bug 6501969)	Winson Chung	2012-05-16	3	-3/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9218d8118926eaafe010daa222b6b0f19ce5ab66': Tweaking AllApps cell size. (Bug 6501969)
\| * \| \| \| \| \|	Tweaking AllApps cell size. (Bug 6501969)	Winson Chung	2012-05-16	3	-3/+5
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I35a42f72fea1ec1e842df73cbdde5f5f029b6834
\| \| \| \| \| \|
\| \ \ \ \ \
*-. \ \ \ \ \	Reconcile with jb-release nakasi-factoryrom-release	The Android Open Source Project	2012-05-16	0	-0/+0
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| / / \| \| \|_\|_\|/ / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \|	Change-Id: I7c8a07aa1820a4a95030299c0d9c8fefbec98ea3
\| \| * \| \|	merge in nakasi-factoryrom-release history after reset to jb-dev	The Android Automerger	2012-05-16	0	-0/+0
\| \|/\| \| \| \|/\| \| \| \|
\| \| * \| \|	merge in nakasi-factoryrom-release history after reset to jb-dev	The Android Automerger	2012-05-15	0	-0/+0
\| \| \|\ \ \