Commit Graph

49925 Commits

Author SHA1 Message Date
The Android Automerger 10066ea3e7 merge in ics-release history after reset to master 2011-11-17 07:01:24 -08:00
The Android Automerger e05eeb089b merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:47:05 -08:00
Michael Jurka 53d4bec537 am fa6f1f51: am 6b077585: am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1
* commit 'fa6f1f512c3a862bdad2a07f3bb36b03269705f0':
  Fix bug where all apps didn't load sometimes
2011-11-17 05:51:29 -08:00
Winson Chung 5202c5a101 am dadbe6b7: am 94355e03: am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1
* commit 'dadbe6b7cac4122d0e2882660a10d5bdb4c64e67':
  Fixing small regressions in folder text offset. (Bug 5600902)
2011-11-17 05:51:28 -08:00
Adam Cohen 55d513780c am 22d4c4a2: am 13c690d4: am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1
* commit '22d4c4a29c453ead99f5d2e7cbb01625ff32412a':
  Modifying portals in landscape on the phone UI
2011-11-17 05:51:27 -08:00
Eric Fischer 1427a34d8a am 949ed903: am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '949ed90320462fa502c534293f602ea9ed257fee':
  Import revised translations.  DO NOT MERGE
2011-11-17 05:51:27 -08:00
Michael Jurka fa6f1f512c am 6b077585: am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1
* commit '6b0775851eb33a2cf255d387d9281cc01722a3ae':
  Fix bug where all apps didn't load sometimes
2011-11-17 05:46:06 -08:00
Winson Chung dadbe6b7ca am 94355e03: am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1
* commit '94355e03e8388b3c7a263c0c9da12bac8c9914f1':
  Fixing small regressions in folder text offset. (Bug 5600902)
2011-11-17 05:46:02 -08:00
Adam Cohen 22d4c4a29c am 13c690d4: am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1
* commit '13c690d42ce0266cc3c008342e27c480fa390e4b':
  Modifying portals in landscape on the phone UI
2011-11-17 05:46:01 -08:00
Eric Fischer 949ed90320 am 6fe22531: (-s ours) am b655d545: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '6fe22531fb81846a1ab69fa1b614e56562841943':
  Import revised translations.  DO NOT MERGE
2011-11-17 05:45:44 -08:00
Winson Chung 6d09268cde Updating default workspace and fixing issue where new hotseat browser icon is not shown. (Bug 5478946, Bug 5623287)
Change-Id: I7ebac3a4bde868de2b5beacc95fc94302dc0d6ee
2011-11-16 18:43:26 -08:00
Michael Jurka 60988ea9a1 Fix bug where all apps didn't load sometimes
Bug #5623281
2011-11-16 16:29:26 -08:00
Adam Cohen 70ed13b370 Fix hiccup when dropping in springloaded mode on large ui
Change-Id: I434c594e0d2c94b122cd3336f36c529e6c3d1066
2011-11-16 15:59:40 -08:00
Michael Jurka 6b0775851e am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1
* commit 'c97ddb679c7b2eaec78f136d840ad7975d03002f':
  Fix bug where all apps didn't load sometimes
2011-11-16 12:59:59 -08:00
Michael Jurka 04ff8f1606 am c97ddb67: Merge "Fix bug where all apps didn\'t load sometimes" into ics-mr1
* commit 'c97ddb679c7b2eaec78f136d840ad7975d03002f':
  Fix bug where all apps didn't load sometimes
2011-11-16 12:59:57 -08:00
Michael Jurka c97ddb679c Merge "Fix bug where all apps didn't load sometimes" into ics-mr1 2011-11-16 12:57:39 -08:00
Winson Chung 94355e03e8 am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1
* commit '345ed924bac099236226c95eee925a91f6b75095':
  Fixing small regressions in folder text offset. (Bug 5600902)
2011-11-16 12:46:24 -08:00
Adam Cohen 13c690d42c am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1
* commit '587ae34aabc03e607c2ec2b37b8709bdf9cc33f0':
  Modifying portals in landscape on the phone UI
2011-11-16 12:46:20 -08:00
Winson Chung 8884e739f0 am 345ed924: Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1
* commit '345ed924bac099236226c95eee925a91f6b75095':
  Fixing small regressions in folder text offset. (Bug 5600902)
2011-11-16 12:27:24 -08:00
Winson Chung 345ed924ba Merge "Fixing small regressions in folder text offset. (Bug 5600902)" into ics-mr1 2011-11-16 12:24:57 -08:00
Adam Cohen 0052d15472 am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1
* commit '587ae34aabc03e607c2ec2b37b8709bdf9cc33f0':
  Modifying portals in landscape on the phone UI
2011-11-16 12:06:47 -08:00
Adam Cohen 587ae34aab Merge "Modifying portals in landscape on the phone UI" into ics-mr1 2011-11-16 12:04:53 -08:00
Eric Fischer 6fe22531fb am b655d545: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'b655d545b7a3f33ac84381c77c649ec9b6197ab4':
  Import revised translations.  DO NOT MERGE
2011-11-16 10:56:27 -08:00
Eric Fischer c00bc77ac7 am b655d545: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'b655d545b7a3f33ac84381c77c649ec9b6197ab4':
  Import revised translations.  DO NOT MERGE
2011-11-16 10:55:39 -08:00
Eric Fischer b655d545b7 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:53:00 -08:00
Eric Fischer edc05f7f8e Import revised translations. DO NOT MERGE
Change-Id: I4b512d8f12d679cc642167aa1d3d35c8cf76ef9b
2011-11-16 10:20:55 -08:00
The Android Automerger 7ba3b5f404 merge in ics-release history after reset to master 2011-11-16 07:00:54 -08:00
The Android Automerger 1a695a7e70 merge in ics-mr1-release history after reset to ics-mr1 2011-11-16 06:46:50 -08:00
Michael Jurka 23501017cb am c4cffe7a: am 6ce5d1d4: am b737ee6a: speeding up transition from other apps -> Launcher
* commit 'c4cffe7a4323f11c7f47aafd0b9bac1d4863f12f':
  speeding up transition from other apps -> Launcher
2011-11-15 18:29:57 -08:00
Michael Jurka c4cffe7a43 am 6ce5d1d4: am b737ee6a: speeding up transition from other apps -> Launcher
* commit '6ce5d1d4ae0aff832d54e8105cd42cf1c58bbced':
  speeding up transition from other apps -> Launcher
2011-11-15 18:25:22 -08:00
Michael Jurka 1b3000268c am b737ee6a: speeding up transition from other apps -> Launcher
* commit 'b737ee6ab2dc4938a1b2a574c336af0eab826712':
  speeding up transition from other apps -> Launcher
2011-11-15 17:26:41 -08:00
Michael Jurka 6ce5d1d4ae am b737ee6a: speeding up transition from other apps -> Launcher
* commit 'b737ee6ab2dc4938a1b2a574c336af0eab826712':
  speeding up transition from other apps -> Launcher
2011-11-15 17:26:05 -08:00
Adam Cohen 78dc83e875 Modifying portals in landscape on the phone UI
Change-Id: I4190b0e4958dfd0d59d943d9b4c4d6fd2e9303c0
2011-11-15 17:10:20 -08:00
Michael Jurka 3d845e8d89 Fix bug where all apps didn't load sometimes
Bug #5623281
2011-11-15 17:04:47 -08:00
Michael Jurka b737ee6ab2 speeding up transition from other apps -> Launcher 2011-11-15 16:36:30 -08:00
Michael Jurka 9e6b263ba2 am 1601d500: am 856a39b8: am 4c4c001a: removing dead code
* commit '1601d500e26c29522b94cc843e5fece3bca5c505':
  removing dead code
2011-11-15 14:49:54 -08:00
Michael Jurka 1601d500e2 am 856a39b8: am 4c4c001a: removing dead code
* commit '856a39b81f8c15b816e94dc7004200f6a9510fce':
  removing dead code
2011-11-15 14:47:19 -08:00
Michael Jurka 856a39b81f am 4c4c001a: removing dead code
* commit '4c4c001a85d8e1533c8df38a0c0d27bb959ebc70':
  removing dead code
2011-11-15 14:44:33 -08:00
Michael Jurka 146642e7f5 am 4c4c001a: removing dead code
* commit '4c4c001a85d8e1533c8df38a0c0d27bb959ebc70':
  removing dead code
2011-11-15 14:42:14 -08:00
Michael Jurka 4c4c001a85 removing dead code 2011-11-15 13:59:13 -08:00
Winson Chung 8b521104a6 am ce1619cd: am e17d2b51: am 2cf7a80c: Merge "Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)" into ics-mr1
* commit 'ce1619cdc12ebb35f1f9849a8cc45812549e9357':
  Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)
2011-11-15 13:16:51 -08:00
Winson Chung 6f6a27b5b4 am 2a3e4a13: am 51f3d707: am 9c35d8ec: Merge "Small changes to help AppsCustomize scrolling." into ics-mr1
* commit '2a3e4a13cca3fa764198ebe21fa15080e12b94c7':
  Small changes to help AppsCustomize scrolling.
2011-11-15 13:16:45 -08:00
Winson Chung ce1619cdc1 am e17d2b51: am 2cf7a80c: Merge "Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)" into ics-mr1
* commit 'e17d2b518091685efd78faef8b470e8104769d3b':
  Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)
2011-11-15 13:11:13 -08:00
Winson Chung 2a3e4a13cc am 51f3d707: am 9c35d8ec: Merge "Small changes to help AppsCustomize scrolling." into ics-mr1
* commit '51f3d707004d9d54c5ffd1522595a30298d386fe':
  Small changes to help AppsCustomize scrolling.
2011-11-15 13:11:12 -08:00
Adam Cohen cc6fd41993 am 8f910a95: am e0944ec7: am 4ff78b0b: Merge "Fixing place where offset caches weren\'t being invalidated (issue 5608330)" into ics-mr1
* commit '8f910a95bc02ddc47ee9f2236c7d3bd07c3c6d74':
  Fixing place where offset caches weren't being invalidated (issue 5608330)
2011-11-15 13:10:32 -08:00
Adam Cohen 8f910a95bc am e0944ec7: am 4ff78b0b: Merge "Fixing place where offset caches weren\'t being invalidated (issue 5608330)" into ics-mr1
* commit 'e0944ec762ec42c8da56d5bffde28ecbc9e76b82':
  Fixing place where offset caches weren't being invalidated (issue 5608330)
2011-11-15 13:07:18 -08:00
Winson Chung 17e85cbfc8 am 2cf7a80c: Merge "Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)" into ics-mr1
* commit '2cf7a80c87b07d2e729ef6c86d547a33b49db47d':
  Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)
2011-11-15 12:43:48 -08:00
Winson Chung 281f0e3cd8 am 9c35d8ec: Merge "Small changes to help AppsCustomize scrolling." into ics-mr1
* commit '9c35d8ec4ecae06a844f013c17fdd90d0898e336':
  Small changes to help AppsCustomize scrolling.
2011-11-15 12:43:47 -08:00
Winson Chung e17d2b5180 am 2cf7a80c: Merge "Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)" into ics-mr1
* commit '2cf7a80c87b07d2e729ef6c86d547a33b49db47d':
  Tweaking portrait AppsCustomize page spacing so that it is visible again. (Bug 5587437)
2011-11-15 12:42:55 -08:00
Winson Chung 51f3d70700 am 9c35d8ec: Merge "Small changes to help AppsCustomize scrolling." into ics-mr1
* commit '9c35d8ec4ecae06a844f013c17fdd90d0898e336':
  Small changes to help AppsCustomize scrolling.
2011-11-15 12:42:55 -08:00