Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,723 Commits 3 Branches 0 Tags
43d536a6f4fe6bbd11352e24adca75ea73ac1135
Commit Graph

10723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wang
43d536a6f4 am 8658eaba: am ac5bd144: Merge change Ib23e57cf into eclair 
Merge commit '8658eaba1e4ab109b6dc9d854c57d80d74e9f61e'

* commit '8658eaba1e4ab109b6dc9d854c57d80d74e9f61e':
  Set roaming based on both data and voice.
 2009-10-01 11:15:47 -07:00
Dirk Dougherty
ee06b671b2 am 5f9be939: am b0702880: am 50128088: Merge change I915efc49 into donut 
Merge commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1'

* commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1':
  Update docs for NDK.
 2009-10-01 11:15:10 -07:00
Dirk Dougherty
ae7d0d4455 am a6c2740d: am e34569fa: am bc0e07bf: Merge change I7b64ad2e into donut 
Merge commit 'a6c2740d695cfb95cf1cd3989cb292d4c2fe1049'

* commit 'a6c2740d695cfb95cf1cd3989cb292d4c2fe1049':
  doc change only. fix toc links on terms page.
 2009-10-01 11:14:59 -07:00
Robert Greenwalt
d9b3d5ccd4 am 9274988e: am 9f9ce253: Merge change I59ceeae4 into eclair 
Merge commit '9274988e444da3b8652912f1a3c0cf0847f19fe3'

* commit '9274988e444da3b8652912f1a3c0cf0847f19fe3':
  Fix the reporting of ActiveApnTypes on CDMA
 2009-10-01 11:13:12 -07:00
Grace Kloba
3af7c575bd am 4435baa4: am 7745e035: Merge change I94c715d6 into eclair 
Merge commit '4435baa48a64ed985e6f7fa8d132560341a78470'

* commit '4435baa48a64ed985e6f7fa8d132560341a78470':
  Skip requestRectangleOnScreen for WebTextView during
 2009-10-01 11:13:01 -07:00
Bjorn Bringert
bf1bc07b44 am c055f869: am 7db7e6a0: Merge change I17f45d35 into eclair 
Merge commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998'

* commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
 2009-10-01 11:11:55 -07:00
Chung-yih Wang
33768deaa7 am d0af7f90: am 31522ad0: Merge change I931ce71e into eclair 
Merge commit 'd0af7f905fc39704c98cfd51961199722e551f9b'

* commit 'd0af7f905fc39704c98cfd51961199722e551f9b':
  Add unit test for the new keystore.
 2009-10-01 11:11:44 -07:00
Dianne Hackborn
dcb305f42e am ce37120d: am 7eca687c: Fix bug where we would return null with disabled components. 
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'

* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
  Fix bug where we would return null with disabled components.
 2009-10-01 11:11:30 -07:00
Dianne Hackborn
892a216105 am 4df43ab1: am ffc16544: Merge change Ib7c1701a into eclair 
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'

* commit '4df43ab1d834f839f3b1e535554836a936902d00':
  Fix issue #1930911: Crash in system process
 2009-10-01 11:10:25 -07:00
John Michelau
21d9b1bf21 am a2fbe447: am a2f5afe6: Merge change I27009b08 into eclair 
Merge commit 'a2fbe44783d190236a42950e0a2585d8835d657f'

* commit 'a2fbe44783d190236a42950e0a2585d8835d657f':
  Fix EVDO SNR signal bar calculation
 2009-10-01 11:09:48 -07:00
Dianne Hackborn
d2b62efc60 am 72191950: am 6b1cb352: Fix issue #2149126: unable to answer incoming call, various problems 
Merge commit '7219195066f365ae4ada788dd416e5e87fc906f5'

* commit '7219195066f365ae4ada788dd416e5e87fc906f5':
  Fix issue #2149126: unable to answer incoming call, various problems
 2009-10-01 11:07:16 -07:00
Jason Sams
eb9adbf045 am e88adf36: am ff966d5f: Merge change I5235cf3f into eclair 
Merge commit 'e88adf369a2f078432b2e35a1656a004af643940'

* commit 'e88adf369a2f078432b2e35a1656a004af643940':
  Fix but processing raster state pragma.
 2009-10-01 11:06:17 -07:00
Mike Cleron
74516d0096 am e6566064: am 0368334d: Merge change Ie1072f12 into eclair 
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'

* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
  Finish off java API to allow fading scrollbars
 2009-10-01 11:06:05 -07:00
Jack Palevich
62effc8b4f am 019116ce: am 97702aac: Merge changes I82c78b83,I54f72d9d into eclair 
Merge commit '019116ce202021e1b274516c9813aeff83b1b5ab'

* commit '019116ce202021e1b274516c9813aeff83b1b5ab':
  Don't ask for pbuffer support, because we don't use any pbuffers.
  Print out EGL configuration info for the config we've chosen.
 2009-10-01 11:05:54 -07:00
Jeff Sharkey
8bd06aabf3 am 0da1a301: am 8f76734d: Fix docs breakage. 
Merge commit '0da1a301dcb4c3a3ad01aadc89f25ccbfd8835bd'

* commit '0da1a301dcb4c3a3ad01aadc89f25ccbfd8835bd':
  Fix docs breakage.
 2009-09-29 11:14:52 -07:00
Jeff Sharkey
a525521b15 am 7d028a0a: am ff18bbf8: Separate API for vCards through openAssetFileDescriptor(). 
Merge commit '7d028a0a974fdee240cac7118bf47c96777ea533'

* commit '7d028a0a974fdee240cac7118bf47c96777ea533':
  Separate API for vCards through openAssetFileDescriptor().
 2009-09-29 11:14:39 -07:00
Dmitri Plotnikov
beeb1f4d7a am b3787062: am 13a90abc: Adding status update attribution to ContactHeaderWidget 
Merge commit 'b3787062bc652d4db71b40ba3a7c991ce1636a96'

* commit 'b3787062bc652d4db71b40ba3a7c991ce1636a96':
  Adding status update attribution to ContactHeaderWidget
 2009-09-29 11:14:32 -07:00
Evan Millar
998f8194d5 am aec2b81d: am 6e98f7e3: Merge change Ie6a95736 into eclair 
Merge commit 'aec2b81d7bc1f42b217d6734a5d23ab820740273'

* commit 'aec2b81d7bc1f42b217d6734a5d23ab820740273':
  Fix artifact in tab drawing.
 2009-09-29 11:14:24 -07:00
Jeff Hamilton
d1d6456aa5 am 84eb12bc: am f36a2bb5: Merge change Ibeb22f37 into eclair 
Merge commit '84eb12bc7ef92ce04d43e1c7ce0319768e3f247e'

* commit '84eb12bc7ef92ce04d43e1c7ce0319768e3f247e':
  Call the proper variant of markAsContacted.
 2009-09-29 11:13:09 -07:00
Mark Wagner
136d3c04b6 am b74e2ac4: am 1cff7476: Merge change Ie7d26695 into eclair 
Merge commit 'b74e2ac44c72c846095334fab7f60111c1271f34'

* commit 'b74e2ac44c72c846095334fab7f60111c1271f34':
  Modify the "active chats" uri to not overlap with other uris.
 2009-09-29 11:13:01 -07:00
Daisuke Miyakawa
64f398a0d8 am d0fefb80: am 3f48d31b: Merge change I228d52db into eclair 
Merge commit 'd0fefb802cc0e7968777e326e91647acd2794e75'

* commit 'd0fefb802cc0e7968777e326e91647acd2794e75':
  Three changes.
 2009-09-29 11:12:35 -07:00
Jack Palevich
f4986570e6 am 0d6d171a: am ee25eb58: Merge change I669ce246 into eclair 
Merge commit '0d6d171af20e52b529c6f42885a2aca70e3a5cef'

* commit '0d6d171af20e52b529c6f42885a2aca70e3a5cef':
  Print out all available EGL configurations.
 2009-09-29 11:12:22 -07:00
Romain Guy
59502b510c am 39433f81: am 5d259d3b: Merge change Id29ec50d into eclair 
Merge commit '39433f818b223aab50b264fb43e8e32da1d8151a'

* commit '39433f818b223aab50b264fb43e8e32da1d8151a':
  Do not crash appwdiget host when a pending intent send fails.
 2009-09-29 11:12:13 -07:00
Mike Lockwood
9753e41c98 am c78f617b: am 733fdf34: Disable keyguard while docked when the lock screen is insecure. 
Merge commit 'c78f617bb66123c224c833ed2bd151d588a9a06d'

* commit 'c78f617bb66123c224c833ed2bd151d588a9a06d':
  Disable keyguard while docked when the lock screen is insecure.
 2009-09-29 11:12:05 -07:00
Tadashi G. Takaoka
0a38e19bf5 am 250d3255: am c031981f: Merge change I36ad03e1 into eclair 
Merge commit '250d3255c6a14944390816108e3edc5e1f19a37a'

* commit '250d3255c6a14944390816108e3edc5e1f19a37a':
  Delegate exclude mimetypes to FasttrackBadgeWidget
 2009-09-29 11:11:31 -07:00
Dianne Hackborn
3f63c58e40 am ccc624ca: am ebd45e5c: Merge change I55edce63 into eclair 
Merge commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0'

* commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0':
  Fix issue #2149145: Safe Mode does not work on Sholes device
 2009-09-29 11:10:53 -07:00
Mike Cleron
68ac73e69b am 1492b96e: am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars 
Merge commit '1492b96eb178631b816bdb253a1b6d1df8133e13'

* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
  Remove obsolete links; start at a method to turn on fading scrollbars
 2009-09-29 11:09:35 -07:00
Wu-cheng Li
dfc1cb1cdf am 90b4a932: am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH. 
Merge commit '90b4a93271520b2952b55520338b153192b834a6'

* commit '90b4a93271520b2952b55520338b153192b834a6':
  Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
 2009-09-29 11:09:04 -07:00
Xavier Ducrohet
f0aa856687 am 25c70dd9: am 279ba943: Merge change I7c7b1596 into eclair 
Merge commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586'

* commit '25c70dd9a13a0ff631e4d3911fceaea863ec2586':
  Fix a warning output.
 2009-09-29 11:08:32 -07:00
Romain Guy
4f588a959d am ba016786: am b4c547a5: Fix possible NPE in AbsListView.positionSelector(). 
Merge commit 'ba0167861d71b0412503843369530575f0d9faeb'

* commit 'ba0167861d71b0412503843369530575f0d9faeb':
  Fix possible NPE in AbsListView.positionSelector().
 2009-09-29 11:08:25 -07:00
Nick Pelly
ef41532861 am 3083a3c1: am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid 
Merge commit '3083a3c11ae303e3fc17d9c7949a46b1e619c146'

* commit '3083a3c11ae303e3fc17d9c7949a46b1e619c146':
  Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
 2009-09-29 11:07:30 -07:00
Bjorn Bringert
b525a9e784 am 575d73a1: am 2dfa6edc: Merge change Ida50e915 into eclair 
Merge commit '575d73a15b33b000feb82f5243c6d9bec7e16083'

* commit '575d73a15b33b000feb82f5243c6d9bec7e16083':
  Pass limit=50 to all suggestion sources.
 2009-09-29 11:06:45 -07:00
John Wang
8658eaba1e am ac5bd144: Merge change Ib23e57cf into eclair 
Merge commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f' into eclair-plus-aosp

* commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f':
  Set roaming based on both data and voice.
 2009-09-29 10:49:12 -07:00
Android (Google) Code Review
ac5bd144f1 Merge change Ib23e57cf into eclair 
* changes:
  Set roaming based on both data and voice.
 2009-09-29 13:26:06 -04:00
Dirk Dougherty
5f9be93958 am b0702880: am 50128088: Merge change I915efc49 into donut 
Merge commit 'b0702880a35d0214bac20973e1459459c52a1e36' into eclair-plus-aosp

* commit 'b0702880a35d0214bac20973e1459459c52a1e36':
  Update docs for NDK.
 2009-09-29 10:19:20 -07:00
Dirk Dougherty
a6c2740d69 am e34569fa: am bc0e07bf: Merge change I7b64ad2e into donut 
Merge commit 'e34569fa54471214c3b58dd23ec17be900240a74' into eclair-plus-aosp

* commit 'e34569fa54471214c3b58dd23ec17be900240a74':
  doc change only. fix toc links on terms page.
 2009-09-29 10:19:13 -07:00
Dirk Dougherty
b0702880a3 am 50128088: Merge change I915efc49 into donut 
Merge commit '501280889ce2bed1b73e7e6ae0d8f4d0afba018a' into eclair

* commit '501280889ce2bed1b73e7e6ae0d8f4d0afba018a':
  Update docs for NDK.
 2009-09-29 10:13:22 -07:00
Android (Google) Code Review
501280889c Merge change I915efc49 into donut 
* changes:
  Update docs for NDK.
 2009-09-29 13:03:12 -04:00
Dirk Dougherty
a1b746ab3a Update docs for NDK. 
Change-Id: I915efc49d0ea736e3fd408628d35f53e3a85c1df
 2009-09-29 09:56:02 -07:00
Dirk Dougherty
e34569fa54 am bc0e07bf: Merge change I7b64ad2e into donut 
Merge commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2' into eclair

* commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2':
  doc change only. fix toc links on terms page.
 2009-09-29 08:56:21 -07:00
Robert Greenwalt
9274988e44 am 9f9ce253: Merge change I59ceeae4 into eclair 
Merge commit '9f9ce253648ad9dda16ae2fd3131073fe5643536' into eclair-plus-aosp

* commit '9f9ce253648ad9dda16ae2fd3131073fe5643536':
  Fix the reporting of ActiveApnTypes on CDMA
 2009-09-29 08:51:57 -07:00
Android (Google) Code Review
9f9ce25364 Merge change I59ceeae4 into eclair 
* changes:
  Fix the reporting of ActiveApnTypes on CDMA
 2009-09-29 11:42:46 -04:00
Android (Google) Code Review
bc0e07bf9a Merge change I7b64ad2e into donut 
* changes:
  doc change only. fix toc links on terms page.
 2009-09-29 11:42:03 -04:00
Grace Kloba
4435baa48a am 7745e035: Merge change I94c715d6 into eclair 
Merge commit '7745e035c94409815850be4be93a300301da576e' into eclair-plus-aosp

* commit '7745e035c94409815850be4be93a300301da576e':
  Skip requestRectangleOnScreen for WebTextView during
 2009-09-29 08:29:16 -07:00
Android (Google) Code Review
7745e035c9 Merge change I94c715d6 into eclair 
* changes:
  Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
 2009-09-29 11:19:48 -04:00
Bjorn Bringert
c055f86986 am 7db7e6a0: Merge change I17f45d35 into eclair 
Merge commit '7db7e6a00c5a0b38bb2077d93a009581941884d3' into eclair-plus-aosp

* commit '7db7e6a00c5a0b38bb2077d93a009581941884d3':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
 2009-09-29 00:41:16 -07:00
Chung-yih Wang
d0af7f905f am 31522ad0: Merge change I931ce71e into eclair 
Merge commit '31522ad0ca71013ac5437a1a43e9078a31ff2213' into eclair-plus-aosp

* commit '31522ad0ca71013ac5437a1a43e9078a31ff2213':
  Add unit test for the new keystore.
 2009-09-29 00:41:10 -07:00
Android (Google) Code Review
7db7e6a00c Merge change I17f45d35 into eclair 
* changes:
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
 2009-09-29 03:35:53 -04:00
Android (Google) Code Review
31522ad0ca Merge change I931ce71e into eclair 
* changes:
  Add unit test for the new keystore.
 2009-09-29 03:27:21 -04:00
Dianne Hackborn
ce37120df3 am 7eca687c: Fix bug where we would return null with disabled components. 
Merge commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp

* commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
  Fix bug where we would return null with disabled components.
 2009-09-29 00:21:53 -07:00