Commit Graph

78507 Commits

Author SHA1 Message Date
Daniel Sandler 55df44f127 am 811954cf: Merge change I7df54f9d into eclair
Merge commit '811954cf77a702663b237165ab1b11a600b73d0d' into eclair-mr2

* commit '811954cf77a702663b237165ab1b11a600b73d0d':
  Clean up name of static wallpapers.
2009-12-02 12:54:43 -08:00
Android (Google) Code Review 811954cf77 Merge change I7df54f9d into eclair
* changes:
  Clean up name of static wallpapers.
2009-12-02 12:49:40 -08:00
Daniel Sandler 0d15cf99c0 Clean up name of static wallpapers.
Change-Id: I7df54f9d13f9808329515eb7b317b21c5ba77afb
http://b/2261747
2009-12-02 14:37:05 -05:00
Joe Onorato cc47007207 am 87a80004: am b0c27f25: Bug 2290800 - Use a collator to sort the app labels.
Merge commit '87a8000440d92be900a997f89b21e3261df872f0' into eclair-mr2-plus-aosp

* commit '87a8000440d92be900a997f89b21e3261df872f0':
  Bug 2290800 - Use a collator to sort the app labels.
2009-12-02 09:57:52 -08:00
Joe Onorato 87a8000440 am b0c27f25: Bug 2290800 - Use a collator to sort the app labels.
Merge commit 'b0c27f254a9929be208d5e04554f438076c833bc' into eclair-mr2

* commit 'b0c27f254a9929be208d5e04554f438076c833bc':
  Bug 2290800 - Use a collator to sort the app labels.
2009-12-02 09:47:05 -08:00
The Android Automerger 1f921ea467 Merge branch 'eclair' into eclair-release 2009-12-02 08:49:59 -08:00
Eric Fischer 1a0f6a398d am bce66392: (-s ours) am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair
Merge commit 'bce66392fe728780bc203657f21e65ad53c097bb'

* commit 'bce66392fe728780bc203657f21e65ad53c097bb':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:39:27 -08:00
Jason Sams 90452567f7 am 6b642891: am 1fdde798: am eb5615d1: Rename special dump properity so we can set it on user builds.
Merge commit '6b642891b9f24edc1020ee93a5d8049b0bef8c06'

* commit '6b642891b9f24edc1020ee93a5d8049b0bef8c06':
  Rename special dump properity so we can set it on user builds.
2009-12-01 17:39:24 -08:00
Eric Fischer bce66392fe am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair
Merge commit 'f3e114265bc3fe843330eeb31a6c6c7364e9bf31' into eclair-mr2-plus-aosp

* commit 'f3e114265bc3fe843330eeb31a6c6c7364e9bf31':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:29:46 -08:00
Jason Sams 6b642891b9 am 1fdde798: am eb5615d1: Rename special dump properity so we can set it on user builds.
Merge commit '1fdde7981b5d081cc3f76fe4bac08fbe10a67a03' into eclair-mr2-plus-aosp

* commit '1fdde7981b5d081cc3f76fe4bac08fbe10a67a03':
  Rename special dump properity so we can set it on user builds.
2009-12-01 17:29:42 -08:00
Eric Fischer f3e114265b am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair
Merge commit 'eaa01f68f24d78b15275a0ee39bc2d6e53f6733e' into eclair-mr2

* commit 'eaa01f68f24d78b15275a0ee39bc2d6e53f6733e':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:10:21 -08:00
Jason Sams 1fdde7981b am eb5615d1: Rename special dump properity so we can set it on user builds.
Merge commit 'eb5615d1af1ef38fd934590b9aec19e1d0cd0908' into eclair-mr2

* commit 'eb5615d1af1ef38fd934590b9aec19e1d0cd0908':
  Rename special dump properity so we can set it on user builds.
2009-12-01 17:10:16 -08:00
Joe Onorato b0c27f254a Bug 2290800 - Use a collator to sort the app labels.
SHAME ON ME for using String.compareTo().
2009-12-01 16:20:30 -08:00
The Android Automerger e6fa41e1d8 Merge branch 'eclair' into eclair-release 2009-12-01 09:06:35 -08:00
Android (Google) Code Review eaa01f68f2 Merge change I46fb1c7f into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-30 11:56:44 -08:00
Jason Sams eb5615d1af Rename special dump properity so we can set it on user builds. 2009-11-30 11:50:10 -08:00
Eric Fischer 46fb1c7f25 Import revised translations. DO NOT MERGE 2009-11-30 11:37:50 -08:00
The Android Automerger 2bc5d4f713 Merge branch 'eclair' into eclair-release 2009-11-30 08:39:26 -08:00
Joe Onorato f4cf55076a am c833cbbc: am ec92f072: am f0be2134: Fix 2275513 - Icons don\'t update on package update
Merge commit 'c833cbbce524c6053ffa3f5a5009e0469a1769cd'

* commit 'c833cbbce524c6053ffa3f5a5009e0469a1769cd':
  Fix 2275513 - Icons don't update on package update
2009-11-24 16:46:16 -08:00
Joe Onorato c833cbbce5 am ec92f072: am f0be2134: Fix 2275513 - Icons don\'t update on package update
Merge commit 'ec92f072bb7d8dcd9d968ffe74426507494ffa23' into eclair-mr2-plus-aosp

* commit 'ec92f072bb7d8dcd9d968ffe74426507494ffa23':
  Fix 2275513 - Icons don't update on package update
2009-11-24 16:43:50 -08:00
Joe Onorato ec92f072bb am f0be2134: Fix 2275513 - Icons don\'t update on package update
Merge commit 'f0be2134e577048c932c5810a7f8a30876bff665' into eclair-mr2

* commit 'f0be2134e577048c932c5810a7f8a30876bff665':
  Fix 2275513 - Icons don't update on package update
2009-11-24 16:42:03 -08:00
Joe Onorato f0be2134e5 Fix 2275513 - Icons don't update on package update
Also reuses the BubbleText object, which was being recreated for no reason.
2009-11-24 19:34:29 -05:00
android-build SharedAccount c4eff24360 Merge commit '99917ca642d148c78ea85a6838eeb5a03bcbaf66' into eclair-release 2009-11-24 15:34:18 -08:00
Joe Onorato 233328cb60 am 3b14a66b: am b2b3fc99: am dbbf45b5: Merge change Ib2061213 into eclair
Merge commit '3b14a66b50f33bcc205808f035deb640d83dc2b0'

* commit '3b14a66b50f33bcc205808f035deb640d83dc2b0':
  Fix bug 2248173 - all apps animates out when you return home.
2009-11-24 14:06:58 -08:00
Romain Guy e15a4b9faa am 8856d939: am 3b4304ad: am 99917ca6: Save 4 MB of space.
Merge commit '8856d939fc5c4e50eefe46736d98155572417184'

* commit '8856d939fc5c4e50eefe46736d98155572417184':
  Save 4 MB of space.
2009-11-24 14:06:55 -08:00
Romain Guy 483d64d55a am 73e6e968: am 53b11e12: am 09cf7d19: Merge change I5289d45d into eclair
Merge commit '73e6e96818027801aa8b9ee740ff966ca5ad8db4'

* commit '73e6e96818027801aa8b9ee740ff966ca5ad8db4':
  Update a couple of wallpapers.
2009-11-24 14:06:49 -08:00
Bjorn Bringert 934d346277 am 55658059: am 6aeeeefb: am 98047dc3: Clear search widget animation in Launcher.onResume()
Merge commit '556580596aa288514d85fca218d5066a04c791fd'

* commit '556580596aa288514d85fca218d5066a04c791fd':
  Clear search widget animation in Launcher.onResume()
2009-11-24 14:06:44 -08:00
Bjorn Bringert 49f5daf2a5 am 869c881d: am 2b68660d: am 600f1887: Guard against null parent in Launcher2.Search.clearAnimation()
Merge commit '869c881d9c174b94452f8ba8ccb1d816625aafe4'

* commit '869c881d9c174b94452f8ba8ccb1d816625aafe4':
  Guard against null parent in Launcher2.Search.clearAnimation()
2009-11-24 14:06:39 -08:00
Jason Sams 81d9ca51df am db1eb1bd: am 52f918e4: am 730c408c: Merge change I84bfa565 into eclair
Merge commit 'db1eb1bd40f68d53a89085ff10e54dc22393791d'

* commit 'db1eb1bd40f68d53a89085ff10e54dc22393791d':
  Improve performance of AllApps for large numbers of apps.
2009-11-24 14:06:33 -08:00
Joe Onorato 3b14a66b50 am b2b3fc99: am dbbf45b5: Merge change Ib2061213 into eclair
Merge commit 'b2b3fc99212eb5bfe012d57d17dd9d9aff5428b4' into eclair-mr2-plus-aosp

* commit 'b2b3fc99212eb5bfe012d57d17dd9d9aff5428b4':
  Fix bug 2248173 - all apps animates out when you return home.
2009-11-24 14:01:08 -08:00
Romain Guy 8856d939fc am 3b4304ad: am 99917ca6: Save 4 MB of space.
Merge commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c' into eclair-mr2-plus-aosp

* commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c':
  Save 4 MB of space.
2009-11-24 14:01:04 -08:00
Romain Guy 73e6e96818 am 53b11e12: am 09cf7d19: Merge change I5289d45d into eclair
Merge commit '53b11e12d428c1eac0596567025ecc15343c4cf6' into eclair-mr2-plus-aosp

* commit '53b11e12d428c1eac0596567025ecc15343c4cf6':
  Update a couple of wallpapers.
2009-11-24 14:01:00 -08:00
Bjorn Bringert 556580596a am 6aeeeefb: am 98047dc3: Clear search widget animation in Launcher.onResume()
Merge commit '6aeeeefb158d1af21c7690d83a2155420cbc1b85' into eclair-mr2-plus-aosp

* commit '6aeeeefb158d1af21c7690d83a2155420cbc1b85':
  Clear search widget animation in Launcher.onResume()
2009-11-24 14:00:56 -08:00
Bjorn Bringert 869c881d9c am 2b68660d: am 600f1887: Guard against null parent in Launcher2.Search.clearAnimation()
Merge commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3' into eclair-mr2-plus-aosp

* commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3':
  Guard against null parent in Launcher2.Search.clearAnimation()
2009-11-24 14:00:51 -08:00
Jason Sams db1eb1bd40 am 52f918e4: am 730c408c: Merge change I84bfa565 into eclair
Merge commit '52f918e43a6a34a2bca2fb95ff0c72273b59305a' into eclair-mr2-plus-aosp

* commit '52f918e43a6a34a2bca2fb95ff0c72273b59305a':
  Improve performance of AllApps for large numbers of apps.
2009-11-24 14:00:45 -08:00
Joe Onorato b2b3fc9921 am dbbf45b5: Merge change Ib2061213 into eclair
Merge commit 'dbbf45b59ed5ebb2beed15b0a169f64e0632c71f' into eclair-mr2

* commit 'dbbf45b59ed5ebb2beed15b0a169f64e0632c71f':
  Fix bug 2248173 - all apps animates out when you return home.
2009-11-24 13:57:36 -08:00
Android (Google) Code Review dbbf45b59e Merge change Ib2061213 into eclair
* changes:
  Fix bug 2248173 - all apps animates out when you return home.
2009-11-24 13:53:30 -08:00
Romain Guy 3b4304ad7a am 99917ca6: Save 4 MB of space.
Merge commit '99917ca642d148c78ea85a6838eeb5a03bcbaf66' into eclair-mr2

* commit '99917ca642d148c78ea85a6838eeb5a03bcbaf66':
  Save 4 MB of space.
2009-11-24 13:42:20 -08:00
Romain Guy 99917ca642 Save 4 MB of space.
Change-Id: I5d0daaaccfc8d18b844542573755efca2c1a4343
2009-11-24 13:37:40 -08:00
Joe Onorato b20612133b Fix bug 2248173 - all apps animates out when you return home. 2009-11-24 16:13:54 -05:00
The Android Automerger 54b58d9eaf Merge branch 'eclair' into eclair-release 2009-11-24 09:29:21 -08:00
Romain Guy 53b11e12d4 am 09cf7d19: Merge change I5289d45d into eclair
Merge commit '09cf7d19db69dc4ac0f3457590e8df539bfec7d1' into eclair-mr2

* commit '09cf7d19db69dc4ac0f3457590e8df539bfec7d1':
  Update a couple of wallpapers.
2009-11-23 13:12:03 -08:00
Android (Google) Code Review 09cf7d19db Merge change I5289d45d into eclair
* changes:
  Update a couple of wallpapers.
2009-11-23 13:08:11 -08:00
Romain Guy bcf2a97629 Update a couple of wallpapers.
Change-Id: I5289d45da13a0405cc2344135b1ace101f0326ca
2009-11-23 13:07:26 -08:00
The Android Automerger 6d8151e32d Merge branch 'eclair' into eclair-release 2009-11-23 09:28:58 -08:00
Bjorn Bringert 6aeeeefb15 am 98047dc3: Clear search widget animation in Launcher.onResume()
Merge commit '98047dc39fd56efc6bf1e93a46eb8614569d2226' into eclair-mr2

* commit '98047dc39fd56efc6bf1e93a46eb8614569d2226':
  Clear search widget animation in Launcher.onResume()
2009-11-23 08:55:46 -08:00
Bjorn Bringert 2b68660d0a am 600f1887: Guard against null parent in Launcher2.Search.clearAnimation()
Merge commit '600f188702c1ce8e5c250ea049a5e22f4ff17577' into eclair-mr2

* commit '600f188702c1ce8e5c250ea049a5e22f4ff17577':
  Guard against null parent in Launcher2.Search.clearAnimation()
2009-11-23 08:55:43 -08:00
Jason Sams 52f918e43a am 730c408c: Merge change I84bfa565 into eclair
Merge commit '730c408ccc76dd7da2235a9af6c84d98d19e6b72' into eclair-mr2

* commit '730c408ccc76dd7da2235a9af6c84d98d19e6b72':
  Improve performance of AllApps for large numbers of apps.
2009-11-23 08:55:36 -08:00
Bjorn Bringert 98047dc39f Clear search widget animation in Launcher.onResume()
Before, Launcher relied on a callback to a SearchManager.OnCancelListener to clear the search widget
animation. However, that doesn't get called if some other app opens the search dialog
before the Launcher is reopened. This change clears the animation in onResume().

Should fix http://b/issue?id=2246760
2009-11-21 22:08:04 +00:00
Bjorn Bringert 600f188702 Guard against null parent in Launcher2.Search.clearAnimation()
Sometimes clearAnimation() is called on the search widget
when it has no parent, e.g. when it being removed from the
home screen. This caused an NPE, because clearAnimation()
called invalidate() on the parent.

This is a partial fix for: http://b/issue?id=2246760
2009-11-21 21:38:05 +00:00