Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,480 Commits 3 Branches 0 Tags
e1cd1ef7b98e015b11f8d31bbeb3d09c8cd805d6
Commit Graph

4880 Commits

Author SHA1 Message Date
Romain Guy
e1cd1ef7b9 am b25cb21f: am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair 
Merge commit 'b25cb21f59da53f138bc516a6047f55a2c412764'

* commit 'b25cb21f59da53f138bc516a6047f55a2c412764':
  Prevent crash in Home when using widgets whose ids collide with Home's
 2009-11-05 16:04:32 -08:00
Jaikumar Ganesh
899ebdf3bf am cc2d3572: am f53f86a7: am 8de4e0ad: Merge change I21d0dca3 into eclair 
Merge commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96'

* commit 'cc2d3572e9cdcb8b9011b664d2e0247d9d7b8c96':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
 2009-11-05 16:00:45 -08:00
Romain Guy
b25cb21f59 am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair 
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp

* commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
  Prevent crash in Home when using widgets whose ids collide with Home's
 2009-11-05 15:57:49 -08:00
Jaikumar Ganesh
cc2d3572e9 am f53f86a7: am 8de4e0ad: Merge change I21d0dca3 into eclair 
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp

* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
 2009-11-05 15:50:11 -08:00
Romain Guy
8426319c5a am f20e9a88: Merge change Idf40f3b0 into eclair 
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
 2009-11-05 15:47:43 -08:00
Android (Google) Code Review
f20e9a88a3 Merge change Idf40f3b0 into eclair 
* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
 2009-11-05 18:42:14 -05:00
Romain Guy
ae8dd29c03 Prevent crash in Home when using widgets whose ids collide with Home's 
resources.

Bug #2228943.

Approved by mcleron, triaged by ryanpc.

Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2
 2009-11-05 15:40:35 -08:00
Jaikumar Ganesh
f53f86a743 am 8de4e0ad: Merge change I21d0dca3 into eclair 
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-mr2

* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
 2009-11-05 15:39:40 -08:00
Android (Google) Code Review
8de4e0ad8f Merge change I21d0dca3 into eclair 
* changes:
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
 2009-11-05 17:15:51 -05:00
Daniel Sandler
b3c8a3ff50 am c3c2f766: am 1bca7612: am eca41b31: Merge change Id1458b01 into eclair 
Merge commit 'c3c2f76682151c5051a02269b1990b6644a9074c'

* commit 'c3c2f76682151c5051a02269b1990b6644a9074c':
  New live wallpaper API to expose author and description strings.
 2009-11-05 14:12:30 -08:00
Daniel Sandler
c3c2f76682 am 1bca7612: am eca41b31: Merge change Id1458b01 into eclair 
Merge commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57' into eclair-mr2-plus-aosp

* commit '1bca7612dfeb78bba91f3985fb6f3567daf13a57':
  New live wallpaper API to expose author and description strings.
 2009-11-05 14:05:19 -08:00
Daniel Sandler
1bca7612df am eca41b31: Merge change Id1458b01 into eclair 
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-mr2

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
 2009-11-05 13:54:40 -08:00
Daniel Sandler
18a509d8fa New live wallpaper API to expose author and description strings. 
First in a sequence of CLs to address
http://b/issue?id=2235307 .

Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
 2009-11-05 15:05:27 -05:00
Jaikumar Ganesh
21d0dca33e Add BMW kits made by Motorola PCS to autoblack list for Bluetooth. 
This may force some Motorola headsets to thow up the Pairing Request.

Bug: 2210365
Dr No: Eastham
 2009-11-05 11:30:18 -08:00
Vasu Nori
9e50993c84 am 99017975: am 195a507f: Merge change I272af007 into eclair-mr2 
Merge commit '990179755525d01a7e005182d8ec04722c7fd396'

* commit '990179755525d01a7e005182d8ec04722c7fd396':
  a possible fix for the bug http://b/issue?id=2200637
 2009-11-05 10:11:03 -08:00
Vasu Nori
9901797555 am 195a507f: Merge change I272af007 into eclair-mr2 
Merge commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp

* commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa':
  a possible fix for the bug http://b/issue?id=2200637
 2009-11-05 10:01:09 -08:00
Android (Google) Code Review
195a507fc3 Merge change I272af007 into eclair-mr2 
* changes:
  a possible fix for the bug http://b/issue?id=2200637
 2009-11-05 12:53:34 -05:00
Daisuke Miyakawa
f53b829132 am 931203d4: am dc0f9efd: Merge change I0d442f0d into eclair-mr2 
Merge commit '931203d4052ad9e02cc0a49b5d6b68c44e4d4072'

* commit '931203d4052ad9e02cc0a49b5d6b68c44e4d4072':
  Add tests for Japanization part of vCard.
 2009-11-04 21:06:54 -08:00
Daisuke Miyakawa
931203d405 am dc0f9efd: Merge change I0d442f0d into eclair-mr2 
Merge commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3' into eclair-mr2-plus-aosp

* commit 'dc0f9efd356e5f212c54f87c7a7ddde5d28046d3':
  Add tests for Japanization part of vCard.
 2009-11-04 20:57:35 -08:00
Android (Google) Code Review
dc0f9efd35 Merge change I0d442f0d into eclair-mr2 
* changes:
  Add tests for Japanization part of vCard.
 2009-11-04 23:49:46 -05:00
Daisuke Miyakawa
4fe2c57c3c Add tests for Japanization part of vCard. 
Fix several bugs around name construction.

Internal issue number: 2195990
 2009-11-05 13:47:48 +09:00
Romain Guy
9ad1a218d7 am 77e68484: am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair 
Merge commit '77e68484f5592e06ca1a881745070f7931641246'

* commit '77e68484f5592e06ca1a881745070f7931641246':
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 17:56:38 -08:00
Romain Guy
77e68484f5 am 05abe8d0: am 131564d2: Merge change I3bbfb4f9 into eclair 
Merge commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71' into eclair-mr2-plus-aosp

* commit '05abe8d01d91389b4b52111ed525aa4c4f4e1b71':
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 17:46:24 -08:00
Romain Guy
05abe8d01d am 131564d2: Merge change I3bbfb4f9 into eclair 
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-mr2

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 17:36:46 -08:00
Eric Olsen
e5e5e5098e am 122f412a: am 76922b83: am 9053fdb3: Merge change I76127f6f into eclair 
Merge commit '122f412a0177c54e32d52a23bf92b78aae4679f7'

* commit '122f412a0177c54e32d52a23bf92b78aae4679f7':
  Add support for colored LED on jogball backlight.
 2009-11-04 17:08:26 -08:00
Daisuke Miyakawa
87ec42a5fc am 7557e547: am 5dbeef6e: Merge change I76588b56 into eclair-mr2 
Merge commit '7557e54700d266f6c44a4ed5c13c52a67599cbe3'

* commit '7557e54700d266f6c44a4ed5c13c52a67599cbe3':
  Make vCard importer handle "PAGER" phone number correctly.
 2009-11-04 17:08:16 -08:00
Android (Google) Code Review
131564d26a Merge change I3bbfb4f9 into eclair 
* changes:
  Remove unused field and add new API to control the children drawing order.
 2009-11-04 19:58:00 -05:00
Romain Guy
293451e4f0 Remove unused field and add new API to control the children drawing order. 
Approved by: xav, hackbod, mcleron.

Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
 2009-11-04 16:57:07 -08:00
Eric Olsen
122f412a01 am 76922b83: am 9053fdb3: Merge change I76127f6f into eclair 
Merge commit '76922b8378f235e79fd861ba846bed833199e59f' into eclair-mr2-plus-aosp

* commit '76922b8378f235e79fd861ba846bed833199e59f':
  Add support for colored LED on jogball backlight.
 2009-11-04 16:54:29 -08:00
Daisuke Miyakawa
7557e54700 am 5dbeef6e: Merge change I76588b56 into eclair-mr2 
Merge commit '5dbeef6e9844a094f87a3f7d4608b431a6724278' into eclair-mr2-plus-aosp

* commit '5dbeef6e9844a094f87a3f7d4608b431a6724278':
  Make vCard importer handle "PAGER" phone number correctly.
 2009-11-04 16:54:20 -08:00
Eric Olsen
76922b8378 am 9053fdb3: Merge change I76127f6f into eclair 
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-mr2

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
 2009-11-04 16:49:31 -08:00
Android (Google) Code Review
5dbeef6e98 Merge change I76588b56 into eclair-mr2 
* changes:
  Make vCard importer handle "PAGER" phone number correctly.
 2009-11-04 19:45:14 -05:00
Daisuke Miyakawa
26ee0ae9de Make vCard importer handle "PAGER" phone number correctly. 
Add tests for it.

Internal issue number: 2239492
 2009-11-05 09:44:42 +09:00
Vasu Nori
272af00768 a possible fix for the bug http://b/issue?id=2200637 2009-11-04 16:26:55 -08:00
Leon Scroggins
486cbdc8e1 am ffb4eeb5: am 3613385f: Do not update the progress if it is the same as the last given progress. 
Merge commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c'

* commit 'ffb4eeb54b90659cd95f89268eec47a509690d4c':
  Do not update the progress if it is the same as the last given progress.
 2009-11-04 15:20:44 -08:00
Leon Scroggins
ffb4eeb54b am 3613385f: Do not update the progress if it is the same as the last given progress. 
Merge commit '3613385fbc5368715e7af1a6676b7bb63fafcf09' into eclair-mr2-plus-aosp

* commit '3613385fbc5368715e7af1a6676b7bb63fafcf09':
  Do not update the progress if it is the same as the last given progress.
 2009-11-04 15:10:05 -08:00
Leon Scroggins
3613385fbc Do not update the progress if it is the same as the last given progress. 2009-11-04 14:50:14 -08:00
Eric Olsen
f42f15cf45 Add support for colored LED on jogball backlight. 
Signed-off-by: Eric Olsen <eolsen@android.com>
 2009-11-04 14:31:26 -08:00
Romain Guy
054951b0b4 am b1c9068f: am 1503f739: am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled. 
Merge commit 'b1c9068fa4763547ac35e632077ac40456361065'

* commit 'b1c9068fa4763547ac35e632077ac40456361065':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
 2009-11-04 06:30:18 -08:00
Romain Guy
b1c9068fa4 am 1503f739: am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled. 
Merge commit '1503f739f8a22822fa969c516564063ef46db52a' into eclair-mr2-plus-aosp

* commit '1503f739f8a22822fa969c516564063ef46db52a':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
 2009-11-04 06:19:43 -08:00
Romain Guy
1503f739f8 am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled. 
Merge commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356' into eclair-mr2

* commit 'e1e0dc8e6eaec052ebb6b88f5b1223075ce5a356':
  Make sure we relayout the TextView when the text changes and marquee is enabled.
 2009-11-04 06:10:26 -08:00
Daisuke Miyakawa
1f2f501c1d am ffe9b571: am f035b477: Make test compontent support multiple vCard input. 
Merge commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934'

* commit 'ffe9b571bc8f299ac9198e00741c612dbd8d5934':
  Make test compontent support multiple vCard input.
 2009-11-04 05:12:40 -08:00
Daisuke Miyakawa
ffe9b571bc am f035b477: Make test compontent support multiple vCard input. 
Merge commit 'f035b47774aabf7397aec5c5459ac9860ad63bab' into eclair-mr2-plus-aosp

* commit 'f035b47774aabf7397aec5c5459ac9860ad63bab':
  Make test compontent support multiple vCard input.
 2009-11-04 05:02:50 -08:00
Daisuke Miyakawa
f035b47774 Make test compontent support multiple vCard input. 
Internal issue number: 2195990
 2009-11-04 21:51:54 +09:00
Romain Guy
e1e0dc8e6e Make sure we relayout the TextView when the text changes and marquee is enabled. 
Bug #2192881.

Change-Id: Iffc2d15947a11974d9dc175740e3a5489cd43d21
 2009-11-03 17:24:55 -08:00
Leon Scroggins
41e94cbcc5 am 91fc3300: am 92534768: Merge change I33909a6a into eclair-mr2 
Merge commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057'

* commit '91fc33004b4c39c736b3b2def79e64cf2b3eb057':
  Do not scroll the title bar off screen until the page finishes loading.
 2009-11-03 16:27:49 -08:00
Leon Scroggins
91fc33004b am 92534768: Merge change I33909a6a into eclair-mr2 
Merge commit '925347688d946d9782bc1cfaa95baacd5b630e38' into eclair-mr2-plus-aosp

* commit '925347688d946d9782bc1cfaa95baacd5b630e38':
  Do not scroll the title bar off screen until the page finishes loading.
 2009-11-03 16:22:10 -08:00
Leon Scroggins
405d785f86 Do not scroll the title bar off screen until the page finishes loading. 
Fix http://b/issue?id=2139418
 2009-11-03 16:01:44 -08:00
Romain Guy
7aeca34250 am da8504a6: am 4d7860d4: am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit 'da8504a65c66fa5b02faffcc6f920c6cf1dcd267'

* commit 'da8504a65c66fa5b02faffcc6f920c6cf1dcd267':
  Unhide View.isOpaque().
 2009-11-03 12:31:06 -08:00
Romain Guy
da8504a65c am 4d7860d4: am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit '4d7860d408d248aaebed973e7f774c02efc290f8' into eclair-mr2-plus-aosp

* commit '4d7860d408d248aaebed973e7f774c02efc290f8':
  Unhide View.isOpaque().
 2009-11-03 12:20:30 -08:00