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

5204 Commits

Author SHA1 Message Date
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
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
Romain Guy
4d7860d408 am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-mr2

* commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84':
  Unhide View.isOpaque().
 2009-11-03 12:15:11 -08:00
Romain Guy
732046f874 Unhide View.isOpaque(). 
Change-Id: I96444af2a7e66a330a2c4b3fa0a173ec5ab4ed40
 2009-11-03 12:09:04 -08:00
Mike Lockwood
dbe7537647 am 44795bc2: am 0ce9c58f: am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair 
Merge commit '44795bc2be71428dac7557468f24f71b7857a8f7'

* commit '44795bc2be71428dac7557468f24f71b7857a8f7':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
 2009-11-03 10:04:27 -08:00
Mike Lockwood
44795bc2be am 0ce9c58f: am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair 
Merge commit '0ce9c58fe33a3b96219944762adbff99d12212a3' into eclair-mr2-plus-aosp

* commit '0ce9c58fe33a3b96219944762adbff99d12212a3':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
 2009-11-03 09:47:47 -08:00
Mike Lockwood
0ce9c58fe3 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair 
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-mr2

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
 2009-11-03 09:37:50 -08:00
Mike Lockwood
4115c51875 Add documentation for proximity and light sensors. 
Change-Id: I116424c468d1d3afe89e0e17be773ee8b80ada92
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-11-03 10:36:24 -05:00
Daisuke Miyakawa
931b83e727 am c4bbb914: am 6cb76ac3: Rename the term "attribute"/"attr" to "parameter"/param". 
Merge commit 'c4bbb9144d1955340d69548e7245417cbe862d3c'

* commit 'c4bbb9144d1955340d69548e7245417cbe862d3c':
  Rename the term "attribute"/"attr" to "parameter"/param".
 2009-11-03 01:07:46 -08:00
Daisuke Miyakawa
c4bbb9144d am 6cb76ac3: Rename the term "attribute"/"attr" to "parameter"/param". 
Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp

* commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5':
  Rename the term "attribute"/"attr" to "parameter"/param".
 2009-11-03 00:58:16 -08:00
Daisuke Miyakawa
6cb76ac37f Rename the term "attribute"/"attr" to "parameter"/param". 
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.

Internal issue number: 2233884
 2009-11-03 17:30:19 +09:00
Dirk Dougherty
3bb6baa349 am 759ac9e3: am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4'

* commit '759ac9e3da0323177cd4ce1f85c04252086b6ea4':
  doc change: misc doc fixes.
 2009-11-03 00:09:57 -08:00
Dirk Dougherty
759ac9e3da am 21cbd52b: am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp

* commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e':
  doc change: misc doc fixes.
 2009-11-02 18:29:52 -08:00
Dirk Dougherty
21cbd52b7a am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-mr2

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
 2009-11-02 18:24:29 -08:00
Dirk Dougherty
483d29c0dd am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair

* commit '671c61d66f8d556f206d167d0f3c3bbe037ed86b':
  doc change: misc doc fixes.
 2009-11-02 18:17:26 -08:00
Android (Google) Code Review
a229cedadd Merge change I73d6c0f8 into eclair 
* changes:
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 18:46:04 -05:00
Dianne Hackborn
22a90c1915 am 50bb2643: am d62b063f: am b6a6791f: Merge change I60413727 into eclair 
Merge commit '50bb2643a5cb28c4e013eceb15c23288c85e0350'

* commit '50bb2643a5cb28c4e013eceb15c23288c85e0350':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 11:13:43 -08:00
Dianne Hackborn
50bb2643a5 am d62b063f: am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'd62b063fd4ac0ae1419348ac62c55527cb398fd9' into eclair-mr2-plus-aosp

* commit 'd62b063fd4ac0ae1419348ac62c55527cb398fd9':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 11:04:56 -08:00
Dianne Hackborn
d62b063fd4 am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-mr2

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 10:52:22 -08:00
Android (Google) Code Review
b6a6791f38 Merge change I60413727 into eclair 
* changes:
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 13:43:52 -05:00