Commit Graph

5389 Commits

Author SHA1 Message Date
The Android Open Source Project c7df8d6596 am 389a4eeb: Reconcile with jb-release
* commit '389a4eeb187fdbc5fd1f7caf5dff90f8a6e1d37a':
2012-05-22 14:21:33 -07:00
The Android Open Source Project 389a4eeb18 Reconcile with jb-release
Change-Id: I71c3f35d846f61dcded1e4fb5ec2eec81da805e4
2012-05-22 13:06:50 -07:00
The Android Automerger bf274b90b0 merge in jb-release history after reset to jb-dev 2012-05-22 07:06:50 -07:00
Michael Jurka 2887a0a9bc am 085888a1: am a4ac83cc: Merge "Update cleanspec to fix build issue" into jb-dev
* commit '085888a1a4ce272966ac18a6e67b00c948ca33b1':
  Update cleanspec to fix build issue
2012-05-21 14:32:50 -07:00
Winson Chung c2a48dafa6 am bfa5d5ba: am fe0e16af: Merge "Updating wallpapers (except for xlarge devices). (Bug 6460469)" into jb-dev
* commit 'bfa5d5bade1e1a6eb41c8425bb3562caa7ad1161':
  Updating wallpapers (except for xlarge devices). (Bug 6460469)
2012-05-21 14:32:36 -07:00
The Android Open Source Project 201d641a18 am 2916480f: Reconcile with jb-release nakasi-factoryrom-release
* commit '2916480f06f23b2b29deeb0c3c78dbb161a4ee49':
  Updating launcher assets.  (Bug 6499087)
  Change custom workspace cling
  Fixing regression where you can't add shortcuts
  Removing logging related to and fixing (issue 6238330)
2012-05-21 14:28:51 -07:00
Michael Jurka ded0c6dde7 am 10b432c3: am be4f1471: Merge "Fix incremental builds" into jb-dev
* commit '10b432c35cf9b9c2abd0d5f484758bbedff5594f':
  Fix incremental builds
2012-05-21 14:11:51 -07:00
Andrew Flynn 9fe80cffaf am 29554778: am cee461da: Merge "Add 1x1 transparent dummy img so we can reference bg_cling5" into jb-dev
* commit '295547788de320294ae8ca26c08699aea1909a14':
  Add 1x1 transparent dummy img so we can reference bg_cling5
2012-05-21 14:11:50 -07:00
Michael Jurka 085888a1a4 am a4ac83cc: Merge "Update cleanspec to fix build issue" into jb-dev
* commit 'a4ac83cc3b285780328a052a2d42646c1abf3d13':
  Update cleanspec to fix build issue
2012-05-21 13:51:29 -07:00
Michael Jurka a4ac83cc3b Merge "Update cleanspec to fix build issue" into jb-dev 2012-05-21 13:49:26 -07:00
Michael Jurka 46fe42f76d Update cleanspec to fix build issue
Change-Id: I5f26adbf30da682ada1288557ab600850b2ba681
2012-05-21 13:45:47 -07:00
Winson Chung bfa5d5bade am fe0e16af: Merge "Updating wallpapers (except for xlarge devices). (Bug 6460469)" into jb-dev
* commit 'fe0e16afe9902c6f5f60ce0d5dcdbcc10290849f':
  Updating wallpapers (except for xlarge devices). (Bug 6460469)
2012-05-21 13:39:40 -07:00
Winson Chung fe0e16afe9 Merge "Updating wallpapers (except for xlarge devices). (Bug 6460469)" into jb-dev 2012-05-21 13:37:09 -07:00
Winson Chung 1b9e88f1db Updating wallpapers (except for xlarge devices). (Bug 6460469)
Change-Id: I60e84830395ae697f36f8fd861f59bc111959ca7
2012-05-21 13:31:35 -07:00
Andrew Flynn e98b8682c2 am 56413666: am 799e00f7: Merge "Use different cling for custom workspace" into jb-dev
* commit '5641366699b8ab253373be0f9005bac3418be7fe':
  Use different cling for custom workspace
2012-05-21 12:45:10 -07:00
Andrew Flynn 8fa8d4013d am 8769126c: am 1d890971: Merge "sw600dp clings" into jb-dev
* commit '8769126c3b92963bfed96e4ab062806b3403ac0a':
  sw600dp clings
2012-05-21 12:45:10 -07:00
Winson Chung 74d2f5ca7b am 7b7476c7: am 907a6fc9: Merge "Updating launcher assets. (Bug 6499087)" into jb-dev
* commit '7b7476c7a38357347674f549bff83fd531529c22':
  Updating launcher assets.  (Bug 6499087)
2012-05-21 12:43:25 -07:00
Andrew Flynn c723fb132f am 6aa0fcbd: am 7f47685e: Merge "Change custom workspace cling" into jb-dev
* commit '6aa0fcbdbc4e979ecec670c9e3a0fdfac7673d5a':
  Change custom workspace cling
2012-05-21 12:41:43 -07:00
Adam Cohen 94af52cac8 am 7ebbfcf9: am 92478920: Fixing regression where you can\'t add shortcuts
* commit '7ebbfcf96a36a8bbd42e621d6e2ed97044592f2a':
  Fixing regression where you can't add shortcuts
2012-05-21 12:41:42 -07:00
Adam Cohen 68d1991e37 am 59adc3b4: am 263301a3: Removing logging related to and fixing (issue 6238330)
* commit '59adc3b40b9eeba1cd0305c69a9c6ba3056db6e5':
  Removing logging related to and fixing (issue 6238330)
2012-05-21 12:41:07 -07:00
Adam Cohen c08f578be9 am 090d999d: am 90340cf6: Adding logging for the bug that won\'t die (issue 6282761)
* commit '090d999dab31a38d4a1ea231ceb6fde53646a84f':
  Adding logging for the bug that won't die (issue 6282761)
2012-05-21 11:51:45 -07:00
Adam Cohen be1f58b5aa am 27ec5e11: am 3aff81c7: Tweak folder creation threshold (issue 6443778)
* commit '27ec5e113c46e85863a9e47239934e0dd51510c7':
  Tweak folder creation threshold (issue 6443778)
2012-05-21 11:51:40 -07:00
The Android Automerger 74cdfdd3ae merge in jb-release history after reset to jb-dev 2012-05-20 07:39:51 -07:00
The Android Open Source Project 2916480f06 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ibfbde4f9437502df4a7580943f99ad13e427bdd5
2012-05-18 18:43:58 -07:00
Michael Jurka 10b432c35c am be4f1471: Merge "Fix incremental builds" into jb-dev
* commit 'be4f1471152ef1377ca7387b1ae0e9ee2ab108c4':
  Fix incremental builds
2012-05-18 15:59:25 -07:00
Andrew Flynn 295547788d am cee461da: Merge "Add 1x1 transparent dummy img so we can reference bg_cling5" into jb-dev
* commit 'cee461daa1bfc6ea13f2be44b1dd4d8055cba749':
  Add 1x1 transparent dummy img so we can reference bg_cling5
2012-05-18 15:59:25 -07:00
Winson Chung 5502329d1d Updating launcher assets. (Bug 6499087)
Change-Id: I4d3593f969917c7b45eb48522ebcea1bc8bb0822
2012-05-18 15:15:21 -07:00
Michael Jurka be4f147115 Merge "Fix incremental builds" into jb-dev 2012-05-18 15:08:51 -07:00
Michael Jurka a93f6fc658 Fix incremental builds
Change-Id: Iac9a31690ef5989b7b25282641345cf482d2170e
2012-05-18 15:05:30 -07:00
Andrew Flynn cee461daa1 Merge "Add 1x1 transparent dummy img so we can reference bg_cling5" into jb-dev 2012-05-18 14:33:12 -07:00
Andrew Flynn 9ca7f84db8 Add 1x1 transparent dummy img so we can reference bg_cling5
(it's only used in overlays)

Change-Id: I357bcabb4017f911a10d3cd6acc244608cc9d8b0
2012-05-18 14:26:26 -07:00
Andrew Flynn 5641366699 am 799e00f7: Merge "Use different cling for custom workspace" into jb-dev
* commit '799e00f71df331d2e715b8f2c167f945b07511b9':
  Use different cling for custom workspace
2012-05-18 14:21:41 -07:00
Andrew Flynn 8769126c3b am 1d890971: Merge "sw600dp clings" into jb-dev
* commit '1d890971b4fa41b1d01f4967f5706497fa38fe58':
  sw600dp clings
2012-05-18 14:21:41 -07:00
Andrew Flynn 799e00f71d Merge "Use different cling for custom workspace" into jb-dev 2012-05-18 13:56:45 -07:00
Andrew Flynn 1d890971b4 Merge "sw600dp clings" into jb-dev 2012-05-18 13:46:18 -07:00
Andrew Flynn a743d3526f Use different cling for custom workspace
Change-Id: I55c53439936d8c300fbb0718216d441f4bab4215
2012-05-18 13:38:52 -07:00
Andrew Flynn 499881f147 sw600dp clings
* Larger OK button
* Expand text width in All Apps

Change-Id: I98af5fadfc79da2313bdcabb201b5dc77bc1bf4f
2012-05-18 12:18:31 -07:00
The Android Automerger 37f3897b1a merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-18 10:49:26 -07:00
Winson Chung 7b7476c7a3 am 907a6fc9: Merge "Updating launcher assets. (Bug 6499087)" into jb-dev
* commit '907a6fc9d6c6bce4c7f8ddb6504e00ae6315c9b0':
  Updating launcher assets.  (Bug 6499087)
2012-05-17 17:46:54 -07:00
Winson Chung 907a6fc9d6 Merge "Updating launcher assets. (Bug 6499087)" into jb-dev 2012-05-17 17:45:07 -07:00
Winson Chung ef8ae81526 Updating launcher assets. (Bug 6499087)
Change-Id: I4d3593f969917c7b45eb48522ebcea1bc8bb0822
2012-05-17 17:39:33 -07:00
Michael Jurka b06093aec3 am 41ca429d: am 65dbf3e4: Merge "Updating search bar animation, and adding use of hw layers." into jb-dev
* commit '41ca429dd595a9430b7c9b0d744a2811ca04407e':
  Updating search bar animation, and adding use of hw layers.
2012-05-17 17:18:19 -07:00
Michael Jurka e2f5308607 am 59cbd418: am 4d173e93: Merge "Fix rendering bug while dragging" into jb-dev
* commit '59cbd4188958b644afe677cb5cef39f221c993a2':
  Fix rendering bug while dragging
2012-05-17 17:18:06 -07:00
Adam Cohen fc1fc03632 am a4d6531a: am 534ea47f: Merge "Yet another attempt to fix (issue 6282761)" into jb-dev
* commit 'a4d6531ab3091e1258320e6a76ec79d4d2e392f8':
  Yet another attempt to fix (issue 6282761)
2012-05-17 17:17:50 -07:00
Winson Chung cc12d9a31d am df7f6601: am e8375ef5: Merge "Prevent multiple size changed callbacks to widgets whenever we reload the workspace." into jb-dev
* commit 'df7f660177ca8d390379eab621aa2cbd2ea0bfbe':
  Prevent multiple size changed callbacks to widgets whenever we reload the workspace.
2012-05-17 15:33:10 -07:00
Winson Chung 01e6d174d3 am 55dc5965: am 9218d811: Tweaking AllApps cell size. (Bug 6501969)
* commit '55dc59658db7287a5649967a31eb78e5ba0db2b0':
  Tweaking AllApps cell size. (Bug 6501969)
2012-05-17 15:32:31 -07:00
Andrew Flynn 99838b8407 Change custom workspace cling
Change-Id: I8fe44469ac4bf38f9be2228d8eace1198bf3a48e
2012-05-17 15:04:40 -07:00
Adam Cohen 98a72fbb08 Fixing regression where you can't add shortcuts
Change-Id: I2c91a9a5131591aa15319efdaf887f06fb593b08
2012-05-17 15:04:40 -07:00
Adam Cohen 5212e51649 Removing logging related to and fixing (issue 6238330)
Change-Id: I7ed89840d90fd13cbfedc795e789706b32f76b5d
2012-05-17 15:04:40 -07:00
Andrew Flynn 6aa0fcbdbc am 7f47685e: Merge "Change custom workspace cling" into jb-dev
* commit '7f47685e662aa4ba17c58d903bc474a35a730444':
  Change custom workspace cling
2012-05-17 13:53:24 -07:00