Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,903 Commits 3 Branches 0 Tags
409a57504fe6bb915d85f1091267206f7e0dfdcd
Commit Graph

13726 Commits

Author SHA1 Message Date
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
7239d4105a am 9ed30f93: Merge change I96444af2 into eclair 
Merge commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-plus-aosp

* commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84':
  Unhide View.isOpaque().
 2009-11-03 12:15:32 -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
3580ee41f1 am d2c68794: Merge changes I116424c4,Ibd0ef67f into eclair 
Merge commit 'd2c68794364120d0531667e797f078416ebef3f5' into eclair-plus-aosp

* commit 'd2c68794364120d0531667e797f078416ebef3f5':
  Remove obsolete hardware auto-brightness support.
  Add documentation for proximity and light sensors.
 2009-11-03 09:37:39 -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
f93cf36964 am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk 
Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.
 2009-11-02 18:27:55 -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
Jaikumar Ganesh
2cc3693d43 am a229ceda: Merge change I73d6c0f8 into eclair 
Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-plus-aosp

* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
  Add ability to disable sending Photos using Vcard. Do Not Merge
 2009-11-02 15:54:33 -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
efb752570e am b6a6791f: Merge change I60413727 into eclair 
Merge commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-plus-aosp

* commit 'b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
  Fix issue #2226370: Resource versions match with equality
 2009-11-02 10:52:30 -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
Daisuke Miyakawa
d026204817 am 648feb77: am 3f16be20: Enable vCard tests connect both importer/exporter tests. 
Merge commit '648feb772445eeaf31fcee6a020e43645411c534'

* commit '648feb772445eeaf31fcee6a020e43645411c534':
  Enable vCard tests connect both importer/exporter tests.
 2009-11-01 22:45:52 -08:00
Daisuke Miyakawa
648feb7724 am 3f16be20: Enable vCard tests connect both importer/exporter tests. 
Merge commit '3f16be2061ddf8daeed959c6e06db9cf561ae304' into eclair-mr2-plus-aosp

* commit '3f16be2061ddf8daeed959c6e06db9cf561ae304':
  Enable vCard tests connect both importer/exporter tests.
 2009-11-01 22:36:02 -08:00
Daisuke Miyakawa
3f16be2061 Enable vCard tests connect both importer/exporter tests. 
Fix a bug in ContactStruct.

Internal issue number: 2195990
 2009-11-02 15:25:23 +09:00
Mike LeBeau
c9e8d30e6a am 0d8aa05d: am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'

* commit '0d8aa05d306205850e3014550bce34735ac78660':
  Add a privateImeOption to represent that the IME should not show
 2009-11-01 21:56:43 -08:00
Jack Wang
a64f95639f am af93c05c: am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'af93c05c9a25018daf375094c8e697b83795b2d4'

* commit 'af93c05c9a25018daf375094c8e697b83795b2d4':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-11-01 21:56:33 -08:00
Jaikumar Ganesh
16dc9b5174 am e0d30d67: am bf2efbc0: am 3cf254d2: Merge change I4b3db907 into eclair 
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'

* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
  Revert the channge where channels were not selected randomly.
 2009-11-01 21:50:19 -08:00
Dianne Hackborn
553399518f Fix issue #2226370: Resource versions match with equality 
Also fixed turned-around increment of version number for resources. :(

Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
 2009-11-01 21:16:59 -08:00
Dirk Dougherty
6b13bc043e doc change: misc doc fixes. 
Bug:2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
 2009-10-30 19:44:22 -07:00
Mike LeBeau
0d8aa05d30 am b5868caa: am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp

* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:41:16 -07:00
Jack Wang
af93c05c9a am 227ba207: am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit '227ba2072df1474a0b3abaae7c415f152d32bcc2' into eclair-mr2-plus-aosp

* commit '227ba2072df1474a0b3abaae7c415f152d32bcc2':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 18:41:08 -07:00
Mike LeBeau
b5868caa8c am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:22:00 -07:00
Mike LeBeau
b09123255e am d3e4dab9: Merge change I7df84618 into eclair 
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-plus-aosp

* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
  Add a privateImeOption to represent that the IME should not show
 2009-10-30 18:21:18 -07:00
Android (Google) Code Review
d3e4dab962 Merge change I7df84618 into eclair 
* changes:
  Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
 2009-10-30 21:12:00 -04:00
Jack Wang
227ba2072d am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:56 -07:00
Jack Wang
1d225d67d9 am e8228afb: Merge change I92cdc5ed into eclair 
Merge commit 'e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-plus-aosp

* commit 'e8228afb2bd005ae25ce58719f9d678389b26a16':
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 17:07:21 -07:00
Android (Google) Code Review
e8228afb2b Merge change I92cdc5ed into eclair 
* changes:
  PerformanceCollector: Collect & report perf measurements in key/value form
 2009-10-30 20:02:13 -04:00
Mike LeBeau
7df846186d Add a privateImeOption to represent that the IME should not show 
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).

The IME will respect this shortly.

http://b/2228562
 2009-10-30 16:11:40 -07:00