5bed4107d2
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I21de3186d1a880575b7309675845e6b382c5882c
2012-06-07 07:51:26 -07:00
e9a10effdc
merge in jb-release history after reset to jb-dev
2012-06-07 07:04:05 -07:00
578b422a9a
am 3a25b14b: am 47824440: Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)" into jb-dev
...
* commit '3a25b14bdb09880994abd991d16080023dc97ad0':
Synchronizing on the new-apps list before modifying it. (Bug 6621553)
2012-06-06 16:22:22 -07:00
3a25b14bdb
am 47824440: Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)" into jb-dev
...
* commit '478244409e15594ceaa7426a6a23cc805db0b1fc':
Synchronizing on the new-apps list before modifying it. (Bug 6621553)
2012-06-06 16:19:43 -07:00
478244409e
Merge "Synchronizing on the new-apps list before modifying it. (Bug 6621553)" into jb-dev
2012-06-06 16:17:04 -07:00
49a1f4a361
am 248dc274: am 57660325: Merge "Update 600dp clings." into jb-dev
...
* commit '248dc2747ecab5030e3a0967d0e845e16f0d4118':
Update 600dp clings.
2012-06-06 16:16:18 -07:00
248dc2747e
am 57660325: Merge "Update 600dp clings." into jb-dev
...
* commit '5766032503a4ace048e69d6540a46134a858cbb9':
Update 600dp clings.
2012-06-06 16:13:33 -07:00
38054cad68
Fixing ConcurrentModificationException (issue 6619380)
...
Change-Id: I49d293a79a463d129e829f823d6b213f3d5ffcf4
2012-06-06 16:13:20 -07:00
56e1d9b569
Defer loading widget previews until after All Apps transition
...
Bug: 6615463
2012-06-06 16:13:19 -07:00
5766032503
Merge "Update 600dp clings." into jb-dev
2012-06-06 16:11:38 -07:00
bfeac0681b
Synchronizing on the new-apps list before modifying it. (Bug 6621553)
...
- Minor tweak to qsb padding
- Adding yet more logging for single-app-page issue
Change-Id: I4272dd7a70c9ac26f026b03a1f991f14844fdb9d
2012-06-06 15:57:27 -07:00
c60d967713
Update 600dp clings.
...
- Assign minWidth to 'OK' button
- Move all_apps_cling 'OK' button higher
Bug: 6535310
Change-Id: Idceecb0bc4ca77c81127e7c24fce79347527e00d
2012-06-06 15:52:11 -07:00
d8c2bbd7bc
am 2be622ac: am 3d50932a: Fixing ConcurrentModificationException (issue 6619380)
...
* commit '2be622ac5f0320aba1c93fc7987aecfc65dce7f8':
Fixing ConcurrentModificationException (issue 6619380)
2012-06-06 15:19:13 -07:00
2be622ac5f
am 3d50932a: Fixing ConcurrentModificationException (issue 6619380)
...
* commit '3d50932a93dd367537db3548bde29d1380b371c0':
Fixing ConcurrentModificationException (issue 6619380)
2012-06-06 15:14:06 -07:00
3d50932a93
Fixing ConcurrentModificationException (issue 6619380)
...
Change-Id: I49d293a79a463d129e829f823d6b213f3d5ffcf4
2012-06-06 15:00:45 -07:00
58879f12bd
am 89f80baa: am 5b7fcb7a: Merge "Defer loading widget previews until after All Apps transition" into jb-dev
...
* commit '89f80baa3654bfd4bd1875fa95628bb2e39548e0':
Defer loading widget previews until after All Apps transition
2012-06-06 13:41:36 -07:00
89f80baa36
am 5b7fcb7a: Merge "Defer loading widget previews until after All Apps transition" into jb-dev
...
* commit '5b7fcb7a8bee95b5c59dd296c6b022e3d1c55102':
Defer loading widget previews until after All Apps transition
2012-06-06 13:37:31 -07:00
5b7fcb7a8b
Merge "Defer loading widget previews until after All Apps transition" into jb-dev
2012-06-06 13:32:12 -07:00
f6a9690c34
Defer loading widget previews until after All Apps transition
...
Bug: 6615463
2012-06-06 11:48:13 -07:00
8d893a3404
am 498601a8: (-s ours) am b21b749b: Import translations. DO NOT MERGE
...
* commit '498601a89635d24286a1a112062c05d9bbd9e2de':
Import translations. DO NOT MERGE
2012-06-06 11:06:17 -07:00
498601a896
am b21b749b: Import translations. DO NOT MERGE
...
* commit 'b21b749bb333f0ba436c7e6a60a259bfd3cb3987':
Import translations. DO NOT MERGE
2012-06-06 11:04:08 -07:00
fc4be14ac6
Import translations. DO NOT MERGE
...
Change-Id: Ifff491153de133fe0574699c620ab09862586fc5
2012-06-06 11:01:11 -07:00
b21b749bb3
Import translations. DO NOT MERGE
...
Change-Id: I5c5f651d689f9000ae91b88b32695589dcf6449d
2012-06-06 11:00:09 -07:00
1ac3e86eb6
merge in jb-release history after reset to jb-dev
2012-06-06 07:04:00 -07:00
4a0a5983fa
am baa4b3ee: am fa31ac21: Merge "Revert "Lock launcher to portrait on devices less than sw720dp"" into jb-dev
...
* commit 'baa4b3eebb8918259349840a44a9b319309bad80':
Revert "Lock launcher to portrait on devices less than sw720dp"
2012-06-05 19:17:42 -07:00
baa4b3eebb
am fa31ac21: Merge "Revert "Lock launcher to portrait on devices less than sw720dp"" into jb-dev
...
* commit 'fa31ac2102a2dad041463a56048d83c2e4ce9098':
Revert "Lock launcher to portrait on devices less than sw720dp"
2012-06-05 19:14:15 -07:00
fa31ac2102
Merge "Revert "Lock launcher to portrait on devices less than sw720dp"" into jb-dev
2012-06-05 19:11:27 -07:00
e6a43a2e26
Fix workaround for crashing on rotation. (Bug 6611883)
...
Change-Id: Iaf9734d156e5aa48f3630f22a42e17d71af37316
2012-06-05 16:24:49 -07:00
a58cc94bee
Workaround for crashing on rotation. (Bug 6611883)
...
Change-Id: Iae24d865fb5a5572c6d3e8726569d234a60ce05c
2012-06-05 16:24:49 -07:00
6b3c6aa213
am ff4714f3: am 5637b87d: Fix workaround for crashing on rotation. (Bug 6611883)
...
* commit 'ff4714f3266d18075f58b6bda7e38d248bcd63ed':
Fix workaround for crashing on rotation. (Bug 6611883)
2012-06-05 16:15:29 -07:00
ff4714f326
am 5637b87d: Fix workaround for crashing on rotation. (Bug 6611883)
...
* commit '5637b87d8b71f2af1794abcd980d9d7ffacb7333':
Fix workaround for crashing on rotation. (Bug 6611883)
2012-06-05 16:12:40 -07:00
cc2c119f33
am 3e95341f: am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)
...
* commit '3e95341fec02b877ee2b97eb03d4a10aa501efb1':
Workaround for crashing on rotation. (Bug 6611883)
2012-06-05 16:06:29 -07:00
5637b87d8b
Fix workaround for crashing on rotation. (Bug 6611883)
...
Change-Id: Iaf9734d156e5aa48f3630f22a42e17d71af37316
2012-06-05 16:05:26 -07:00
3e95341fec
am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)
...
* commit '67640c0cbe27e6c83b69070d23ea50c4a6f18447':
Workaround for crashing on rotation. (Bug 6611883)
2012-06-05 16:01:23 -07:00
67640c0cbe
Workaround for crashing on rotation. (Bug 6611883)
...
Change-Id: Iae24d865fb5a5572c6d3e8726569d234a60ce05c
2012-06-05 15:47:55 -07:00
20370f0a9f
am d63e27ee: am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into jb-dev
...
* commit 'd63e27eed277485df45fa2a719b4878a8ec31215':
Don't set hard width/height for cling OK button.
2012-06-05 15:02:25 -07:00
d63e27eed2
am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into jb-dev
...
* commit 'e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7':
Don't set hard width/height for cling OK button.
2012-06-05 15:00:17 -07:00
e6d3361ee8
Merge "Don't set hard width/height for cling OK button." into jb-dev
2012-06-05 14:41:41 -07:00
04617ad4c8
Don't set hard width/height for cling OK button.
...
Bug: 6587934
Change-Id: I0cb153006f3c852a9b7427c0944d9b55e3a955d8
2012-06-05 14:26:12 -07:00
7d5c89eb71
am efaac3d4: am bbf595dc: Merge "Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)" into jb-dev
...
* commit 'efaac3d4d77c76a02042746c93712d80b965c0c0':
Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)
2012-06-05 12:25:45 -07:00
efaac3d4d7
am bbf595dc: Merge "Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)" into jb-dev
...
* commit 'bbf595dced57bbc16633eb7d6583b1bf27a2508d':
Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)
2012-06-05 10:33:54 -07:00
bbf595dced
Merge "Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)" into jb-dev
2012-06-05 10:31:26 -07:00
fd39d8ee95
Extending timeout workaround for updating the widget tray after we get a packages-changed broadcast. (Bug 6602951)
...
Change-Id: Ice56816e85dda0bd04782d8b98e37566286e23e6
2012-06-05 10:13:56 -07:00
5b1a2ec48a
am 0964ec26: am f9426d5d: Fix issue where landscape asset was appearing in QSB (issue 6605638)
...
* commit '0964ec26989827b4e4a948d9442df9de1e26b463':
Fix issue where landscape asset was appearing in QSB (issue 6605638)
2012-06-05 09:21:18 -07:00
8f303da5b5
merge in jb-release history after reset to jb-dev
2012-06-05 06:59:33 -07:00
0964ec2698
am f9426d5d: Fix issue where landscape asset was appearing in QSB (issue 6605638)
...
* commit 'f9426d5df0592a67c8a998d3ab445a3bb5eafc18':
Fix issue where landscape asset was appearing in QSB (issue 6605638)
2012-06-04 17:39:58 -07:00
f9426d5df0
Fix issue where landscape asset was appearing in QSB (issue 6605638)
...
Change-Id: I6e66be228d2fa2d49f8cb191ab3f4d1a3dd66ef1
2012-06-04 17:27:42 -07:00
a60166386d
Revert "Lock launcher to portrait on devices less than sw720dp"
...
This reverts commit 51726adc25
2012-06-04 14:15:42 -07:00
7b1deb5b0c
Removing logging (issue 6583911)
...
Change-Id: I1f5579d13af1b3daa0734e04d72f60ac8075f29b
2012-06-04 13:34:49 -07:00
e2ef9afee4
am a7d57335: am d4532bb7: Merge "Fixing issue where widgets could be inflated in wrong orientation (issue 6584646)" into jb-dev
...
* commit 'a7d57335f2c66e170f949c2c4a6abac9ed2ae589':
Fixing issue where widgets could be inflated in wrong orientation (issue 6584646)
2012-06-04 13:22:53 -07:00
The Android Open Source Project
The Android Automerger
Winson Chung
Andrew Flynn
Adam Cohen
Michael Jurka
Eric Fischer
Jeff Brown