Commit Graph

20037 Commits

Author SHA1 Message Date
Eric Laurent
1095f2bcef am 33e0d834: am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread
Merge commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa'

* commit '33e0d8343174339cc9622d63c23d47c0ba0d3baa':
  LVM release 1.05 delivery
2010-08-24 14:43:54 -07:00
Wink Saville
fda651cbb0 Merge "Allow reliable detection of a message that is in use." 2010-08-24 14:33:29 -07:00
Adam Powell
7acc86a1af Merge "Disable FEATURE_ACTION_BAR on windows with incompatible feature sets." 2010-08-24 14:29:48 -07:00
Gilles Debunne
dea27daeab am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
2010-08-24 14:25:57 -07:00
Gilles Debunne
734f574e81 Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Brad Fitzpatrick
016a98d8f2 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
2010-08-24 14:18:26 -07:00
Brad Fitzpatrick
85e027d237 Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00
Daisuke Miyakawa
19455eece8 am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.
2010-08-24 13:39:42 -07:00
Daisuke Miyakawa
1543ffc428 am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread
Merge commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f' into gingerbread-plus-aosp

* commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f':
  Make VCardTestsBase public.
2010-08-24 13:39:37 -07:00
Daisuke Miyakawa
5090002867 Merge "Fix vCard so that it looks at IM correctly." into gingerbread 2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
c5c4078cb4 Merge "Make VCardTestsBase public." into gingerbread 2010-08-24 13:36:43 -07:00
Chet Haase
8ea67e354b Merge "Add facilities for layout transitions" 2010-08-24 13:15:45 -07:00
Guang Zhu
498a19eb0c Merge "change the DRT to use Light theme" 2010-08-24 13:06:50 -07:00
Hung-ying Tyan
de0067f73a am 1537637c: am 3294d44b: Add confcall management to SIP calls
Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7'

* commit '1537637cc443a48e9afb8091b6f2ce329318f2d7':
  Add confcall management to SIP calls
2010-08-24 12:58:22 -07:00
Chia-chi Yeh
5e47fe03a4 am 2ac479fa: am a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread
Merge commit '2ac479faeb03daa5083d91726f7b639984617ba2'

* commit '2ac479faeb03daa5083d91726f7b639984617ba2':
  RTP: integrate the echo canceller from speex.
2010-08-24 12:58:11 -07:00
Chia-chi Yeh
647dd255f9 am 50246cd5: am 5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Merge commit '50246cd5df8098a1541b0d90ef7dc8832cfe7e11'

* commit '50246cd5df8098a1541b0d90ef7dc8832cfe7e11':
  RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
2010-08-24 12:57:47 -07:00
Brad Fitzpatrick
871e481b7b Merge "resolved conflicts for merge of 0b7b9807 to master" 2010-08-24 12:55:43 -07:00
Daniel Sandler
d7f58093cc Merge "More final artwork for status bar." 2010-08-24 12:43:42 -07:00
Brad Fitzpatrick
2e20f7e478 resolved conflicts for merge of 0b7b9807 to master
Change-Id: If60aeeb47cd06dcc76b88506688c7e4b58cf2208
2010-08-24 12:40:13 -07:00
Daniel Sandler
1047cdc21f Merge "Final status bar artwork." 2010-08-24 12:38:36 -07:00
Jean-Baptiste Queru
761e488b38 am bacc3aa8: am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7'

* commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
  Amend previous ndc commit
  Add a method to let a properly permissioned app directly
  Changed SyncOperation.toKey() to not rely on the implementation of
  Squashed commit of the following:
  Add more error checking for ndc
  PackageManagerService: always install native binaries from .apk
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
  Fix a bug where we cleaned an apps external data when upgrading it. :(
  Skip hostname verification when using insecure factory
  Flush binder buffer after setting raw heap to avoid leaking a reference.
  Fix issue #2834005: Android Settings.Secure bypass
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
  Verify hostname where possible, and clarify where not.
2010-08-24 12:09:03 -07:00
Robert Greenwalt
71cc43b8cb am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit '6d7346933580c107f461885dc273d7298a46b0df' into gingerbread-plus-aosp

* commit '6d7346933580c107f461885dc273d7298a46b0df':
  Send all Connectivity broadcasts.
2010-08-24 12:04:52 -07:00
Robert Greenwalt
bb6ddcb112 Merge "Send all Connectivity broadcasts." into gingerbread 2010-08-24 12:01:50 -07:00
Dianne Hackborn
fea39c6e46 am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread
Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb'

* commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb':
  More watermark work.
2010-08-24 11:54:49 -07:00
Dirk Dougherty
ae5f1dfe42 am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'

* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-24 11:54:39 -07:00
Kenny Root
c3e860f285 resolved conflicts for merge of b037da40 to master
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
2010-08-24 11:48:37 -07:00
Jean-Baptiste Queru
e8818946cb am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Merge commit '026231284c44ca8cf789e0d5045c5ae6a91d7766'

* commit '026231284c44ca8cf789e0d5045c5ae6a91d7766':
  Crash when powering off.
2010-08-24 11:22:05 -07:00
Jean-Baptiste Queru
a691eca9a3 am 360ab1df: am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '360ab1dfb4ca9e33a604a5e2339c87291880faff'

* commit '360ab1dfb4ca9e33a604a5e2339c87291880faff':
  Adds the ability to Android to initiate a 2 Digit Call.
2010-08-24 11:21:59 -07:00
Mathias Agopian
9f0974c360 am 394c9bf6: am 0c76c7c5: Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Merge commit '394c9bf659fdfc5f5a9495159d9a70eaa5772b7e'

* commit '394c9bf659fdfc5f5a9495159d9a70eaa5772b7e':
  add new sensor types for handling gyro data and device orientation
2010-08-24 11:21:42 -07:00
Sean McNeil
abdf313272 am 9b7b5c27: am 40a87586: Only monitor recognized uevent devices.
Merge commit '9b7b5c275ef8d7f653efe3f1de9c64c23a899882'

* commit '9b7b5c275ef8d7f653efe3f1de9c64c23a899882':
  Only monitor recognized uevent devices.
2010-08-24 11:21:11 -07:00
Scott Main
1b01a525c8 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'

* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
  docs: add dev guide for getting user location
2010-08-24 11:21:04 -07:00
Andreas Huber
e90657a362 am 31e71131: am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread
Merge commit '31e71131049c943a388134e796087e109248efcc'

* commit '31e71131049c943a388134e796087e109248efcc':
  Better handling of rtsp connection and disconnection.
2010-08-24 11:20:57 -07:00
James Dong
db94c17daf am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter
Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b'

* commit '28a92120a702289533a9c9d004bd60f83b2fd98b':
  Runtime dump support for MediaWriter
2010-08-24 11:20:40 -07:00
Chia-chi Yeh
dc322eaf61 am a102871c: am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0'

* commit 'a102871c7cbb74ebddc53231a871145de61351b0':
  Visualizer: replace the FFT implementation with a faster one.
2010-08-24 11:19:28 -07:00
Kenny Root
2e176af8f2 resolved conflicts for merge of d51a933b to master
Change-Id: Ibc02613d129b0bdbb579c1a4e58147d720301acc
2010-08-24 11:16:28 -07:00
Irfan Sheriff
8ccb3cade1 am b65444df: (-s ours) am 80db4381: Merge "DO NOT MERGE Enable all networks on screen on" into gingerbread
Merge commit 'b65444df013020000a0d60491e9cf14c950c9500'

* commit 'b65444df013020000a0d60491e9cf14c950c9500':
  DO NOT MERGE Enable all networks on screen on
2010-08-24 11:02:08 -07:00
Steve Howard
2a8e18c730 am 6d895fdb: am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit '6d895fdbc023743f3870042e73a5614764e4165b'

* commit '6d895fdbc023743f3870042e73a5614764e4165b':
  Make ProgressBar.setVisibility() remotable.
2010-08-24 11:01:14 -07:00
Trevor Johns
20414f83b6 am 63f05fe4: am bb75aa90: am ca9d51b1: Disabling AccessibilityService sample from build system.
Merge commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3'

* commit '63f05fe487d23e559e9d3f2c285d1c35aa75b9b3':
  Disabling AccessibilityService sample from build system.
2010-08-24 11:01:02 -07:00
Gilles Debunne
ab5d2814ac Merge "Added new Holo assets for Check boxes and Radio buttons." 2010-08-24 10:57:20 -07:00
Jean-Baptiste Queru
ad0f5cc955 resolved conflicts for merge of c64b916e to master
Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1
2010-08-24 10:45:16 -07:00
Gilles Debunne
aef5507a7e am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Jean-Baptiste Queru
85df24f114 am f235a519: am ec58dff0: Fix build - remove dead doc link
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
2010-08-24 10:25:00 -07:00
Jean-Baptiste Queru
851a5c882e am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation
2010-08-24 10:17:03 -07:00
Wink Saville
5ff0512a0e am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
2010-08-24 10:16:42 -07:00
Jean-Baptiste Queru
b11bdfbf13 am b13c9bc5: manual merge
Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6'

* commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6':
  BluetoothHeadset.java:
2010-08-24 10:16:28 -07:00
Romain Guy
e83f259acf am 5a14271a: am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit '5a14271aacb932ba0d52978c939f74e4c685f7d6'

* commit '5a14271aacb932ba0d52978c939f74e4c685f7d6':
  Load bitmaps in the correct format.
2010-08-24 10:15:51 -07:00
Vasu Nori
87e80d759e Merge "SQLiteOpenHelper should discard closed singleton database objects" 2010-08-24 10:08:13 -07:00
Eric Laurent
a57fcb8ab7 am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread
Merge commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd' into gingerbread-plus-aosp

* commit 'b6d71351c074d5c0bc13a91544d776f1524eaabd':
  LVM release 1.05 delivery
2010-08-24 09:58:23 -07:00
Kenny Root
375d098185 resolved conflicts for merge of 485de781 to master
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
2010-08-24 09:57:33 -07:00
Eric Laurent
75e9fadbf8 Merge "LVM release 1.05 delivery" into gingerbread 2010-08-24 09:50:13 -07:00