ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
3,855 Commits 2 Branches 0 Tags 54 MiB
4958f256d5
Commit Graph

3855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
4958f256d5 am 688b0f12: am 36d5aaec: Merge change 22322 into donut 
Merge commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d' into eclair-plus-aosp

* commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d':
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
 2009-08-22 07:47:46 -07:00
Ken Shirriff
8442920159 am 5f5989de: Add tests for RecurrenceSet. 
Merge commit '5f5989de7cac3583a2217b03e9661d2abb1a1d70' into eclair-plus-aosp

* commit '5f5989de7cac3583a2217b03e9661d2abb1a1d70':
  Add tests for RecurrenceSet.
 2009-08-22 07:45:26 -07:00
Libin Tang
65e931608d am 7b0cdc88: Merge change 22362 into eclair 
Merge commit '7b0cdc8890a849283d31a15126e73edce3bdf3a6' into eclair-plus-aosp

* commit '7b0cdc8890a849283d31a15126e73edce3bdf3a6':
  Fix +NANP issue and cleanup plus code conversion.
 2009-08-22 07:45:13 -07:00
Guo-Bin Zhang
c6e528e9de am 1cef2289: Disable data call in emergency call 
Merge commit '1cef22890d10417977397a5dccf34956858d0803' into eclair-plus-aosp

* commit '1cef22890d10417977397a5dccf34956858d0803':
  Disable data call in emergency call
 2009-08-22 07:45:05 -07:00
Romain Guy
9409506980 am 6f89172b: Merge change 22352 into eclair 
Merge commit '6f89172b6e149c623fe582e4baa658299a3fc72c' into eclair-plus-aosp

* commit '6f89172b6e149c623fe582e4baa658299a3fc72c':
  Fix FallRS by keeping a reference to the mesh.
 2009-08-22 07:44:42 -07:00
Eric Fischer
4bc4ff7074 am 36d5aaec: Merge change 22322 into donut 
Merge commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair

* commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
 2009-08-22 07:43:44 -07:00
Android (Google) Code Review
f5fcc8b50c Merge change 22362 into eclair 
* changes:
  Fix +NANP issue and cleanup plus code conversion.
 2009-08-21 17:05:24 -07:00
Android (Google) Code Review
56b1ba2020 Merge change 22352 into eclair 
* changes:
  Fix FallRS by keeping a reference to the mesh.
 2009-08-21 16:30:13 -07:00
Ken Shirriff
110246b0a8 am 426ac065: Merge change 22328 into eclair 
Merge commit '426ac065d0065507b7bc8c7c5c47fc2b09de2c82' into eclair-plus-aosp

* commit '426ac065d0065507b7bc8c7c5c47fc2b09de2c82':
  Fix recurrence parsing for all-day events.
 2009-08-21 16:01:01 -07:00
Android (Google) Code Review
29a0c373ab Merge change 22328 into eclair 
* changes:
  Fix recurrence parsing for all-day events.
 2009-08-21 15:58:43 -07:00
Mathias Agopian
aad60b7328 am 7a1c20ad: Merge change 22344 into eclair 
Merge commit '7a1c20ad4bfdc9b54b1b0b90115afed774bb9811' into eclair-plus-aosp

* commit '7a1c20ad4bfdc9b54b1b0b90115afed774bb9811':
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
 2009-08-21 15:47:33 -07:00
Android (Google) Code Review
299297a341 Merge change 22344 into eclair 
* changes:
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
 2009-08-21 15:45:22 -07:00
Mathias Agopian
04bc12bd43 fix [2070341] [FAST BLOCKER] can't successfully setup erc52 2009-08-21 15:44:17 -07:00
Wei Huang
fbe647fa9e am d3d79453: Merge change 22331 into eclair 
Merge commit 'd3d794530962e69df54b6421ed5e0d03d76165ab' into eclair-plus-aosp

* commit 'd3d794530962e69df54b6421ed5e0d03d76165ab':
  add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
 2009-08-21 15:22:45 -07:00
Android (Google) Code Review
cbd6b7f4d8 Merge change 22331 into eclair 
* changes:
  add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
 2009-08-21 15:20:31 -07:00
Alex Gruenstein
90fdb5b7f7 am f1b64f64: do not merge. Remove voicesearch-specific functionality from framework. 
Merge commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5' into eclair-plus-aosp

* commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5':
  do not merge.  Remove voicesearch-specific functionality from framework.
 2009-08-21 15:12:07 -07:00
Android (Google) Code Review
e50b5789ce Merge change 22322 into donut 
* changes:
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
 2009-08-21 14:47:41 -07:00
Tom Taylor
dc66a378b8 am 00ddbcaa: Merge change 22314 into eclair 
Merge commit '00ddbcaa2e8a181a2efd5456a65c619ed941e4b0' into eclair-plus-aosp

* commit '00ddbcaa2e8a181a2efd5456a65c619ed941e4b0':
  Purge cache
 2009-08-21 14:12:45 -07:00
Android (Google) Code Review
c4f351eb2a Merge change 22314 into eclair 
* changes:
  Purge cache
 2009-08-21 14:10:12 -07:00
Dmitri Plotnikov
45cdfd5ce8 am 4178b9bd: Merge change 22316 into eclair 
Merge commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6' into eclair-plus-aosp

* commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6':
  Cleaning up Presence API
 2009-08-21 13:48:01 -07:00
Li Zhe
19fb39e2a6 am 6c6d822f: Merge change 22318 into eclair 
Merge commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6' into eclair-plus-aosp

* commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6':
  Framework changes to support HSDPA/HSUPA/HSPA
 2009-08-21 13:45:30 -07:00
Android (Google) Code Review
687f6f09ea Merge change 22316 into eclair 
* changes:
  Cleaning up Presence API
 2009-08-21 13:45:22 -07:00
Android (Google) Code Review
e2577786f1 Merge change 22318 into eclair 
* changes:
  Framework changes to support HSDPA/HSUPA/HSPA HSDPA: High-Speed Downlink Packet Access HSUPA: High-Speend Uplink Packet Access HSPA:  High-Speed Packet Access
 2009-08-21 13:43:01 -07:00
Dmitri Plotnikov
a101093201 am 358e6e3c: Merge change 22292 into eclair 
Merge commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083' into eclair-plus-aosp

* commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083':
  Adding a "Photo" directory under Contacts.
 2009-08-21 13:42:54 -07:00
Android (Google) Code Review
ca7bd9168d Merge change 22292 into eclair 
* changes:
  Adding a "Photo" directory under Contacts.
 2009-08-21 13:40:40 -07:00
Romain Guy
8f0871cafc am cc0a17cb: Merge change 22290 into eclair 
Merge commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9' into eclair-plus-aosp

* commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9':
  Fix typo: the x offset was assigned to the y coordinate.
 2009-08-21 13:38:44 -07:00
Android (Google) Code Review
7647aa3bd1 Merge change 22290 into eclair 
* changes:
  Fix typo: the x offset was assigned to the y coordinate.
 2009-08-21 13:36:30 -07:00
Xavier Ducrohet
cc2bd7678b am 51afbd30: Merge change 22308 into eclair 
Merge commit '51afbd308dff8bd7accf5510e60367107d4c40a1' into eclair-plus-aosp

* commit '51afbd308dff8bd7accf5510e60367107d4c40a1':
  Replace fullHeight support by fullSize (height and width)
 2009-08-21 13:28:48 -07:00
Android (Google) Code Review
dd7639ccfb Merge change 22308 into eclair 
* changes:
  Replace fullHeight support by fullSize (height and width)
 2009-08-21 13:26:19 -07:00
Jean-Baptiste Queru
0205f73166 am dd03c613: resolved conflicts for merge of 081a136d to eclair 
Merge commit 'dd03c6135f91df6d5d9e71de1487520dc3345742' into eclair-plus-aosp

* commit 'dd03c6135f91df6d5d9e71de1487520dc3345742':
  Remove third party support for Quick Search Box (aka global search).
 2009-08-21 13:01:22 -07:00
Jean-Baptiste Queru
e0037413f2 resolved conflicts for merge of 081a136d to eclair 2009-08-21 12:59:04 -07:00
Jaikumar Ganesh
5be072f271 am bfcfb7ee: Merge change 22302 into eclair 
Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp

* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
  Set BondState to Canceled when user cancels pairing.
 2009-08-21 11:56:06 -07:00
Android (Google) Code Review
dcab2ad3b6 Merge change 22302 into eclair 
* changes:
  Set BondState to Canceled when user cancels pairing.
 2009-08-21 11:54:15 -07:00
Jean-Baptiste Queru
e4db6fa09c merge from open-source master 2009-08-21 10:19:09 -07:00
Android (Google) Code Review
0d425d1724 Merge change 22282 into eclair 
* changes:
  Fix Calling screen shows "In Call" on pressing mute button
 2009-08-21 09:55:41 -07:00
Android (Google) Code Review
4fb7fd3782 Merge change 22281 into eclair 
* changes:
  Delay radio reset to wait for data cleanup in CdmaDataConnectionTracker
 2009-08-21 09:50:48 -07:00
Android Code Review
931857b925 Merge change 10274 
* changes:
  Ignore pause and seek for live streaming.
 2009-08-21 06:23:31 -07:00
Android (Google) Code Review
f2dfb1316b Merge change 22135 into eclair 
* changes:
  Support full length rendering.
 2009-08-20 20:25:28 -07:00
Android (Google) Code Review
cc21604147 Merge change 22178 into eclair 
* changes:
  - add a reset to EntityIterator to allow it to go back to the beginning - clean up the debug printing of SyncResult
 2009-08-20 20:02:37 -07:00
Bob Lee
a1f6cd917c am e97c2006: Updated Browser and MCS to use shared default trust manager instead of initializing their own copies. 
Merge commit 'e97c2006bf7c391c933307e520a392e532aa5d6a' into eclair

* commit 'e97c2006bf7c391c933307e520a392e532aa5d6a':
  Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
 2009-08-20 19:31:59 -07:00
Android (Google) Code Review
60ff986692 Merge change 22222 into eclair 
* changes:
  fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
 2009-08-20 19:12:51 -07:00
Mathias Agopian
baca89c06a fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one. 
We now just try to honor the stencil / depth buffer "at least", while doing a "shortest distance" on the colors.
 2009-08-20 19:09:34 -07:00
Android (Google) Code Review
7c9fea2ead Merge change 22208 into eclair 
* changes:
  Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
 2009-08-20 18:22:07 -07:00
Android (Google) Code Review
33dcc6a57d Merge change 22186 into eclair 
* changes:
  Allow null to be re-bound as a root script.  This was always legal from native and just a limitation of the java binding for the API.
 2009-08-20 17:24:52 -07:00
Android (Google) Code Review
cab952d5b8 Merge change 22086 into eclair 
* changes:
  Tweak the ContactsHeaderWidget to match the newest specs.
 2009-08-20 17:12:43 -07:00
Android (Google) Code Review
9bbc9ac002 Merge change 22169 into eclair 
* changes:
  Cleanup the Galaxy, add a few RS functions for Grass.
 2009-08-20 17:08:54 -07:00
Android (Google) Code Review
239080103b Merge change 22163 into eclair 
* changes:
  Point Sprites
 2009-08-20 16:53:25 -07:00
Android (Google) Code Review
c7706719e5 Merge change 22154 into eclair 
* changes:
  Fix fastscroll overlay size on WVGA by using dip.
 2009-08-20 16:49:25 -07:00
Eric Fischer
bc9d77b57a am b7aec912: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit 'b7aec9124a44c60509c00f1d306fd08860d6197c' into eclair

* commit 'b7aec9124a44c60509c00f1d306fd08860d6197c':
  Import revised translations.  DO NOT MERGE
 2009-08-20 16:00:45 -07:00
Scott Main
f5a045fc9e am 185d74ba: Merge change 21977 into donut 
Merge commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788' into eclair

* commit '185d74ba56ccaca3f4bb105d00562bcd5a82c788':
  docs only.
 2009-08-20 16:00:41 -07:00