Scott Main
1e0f732364
am a45d6937: docs: dashboard update
...
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
docs: dashboard update
2010-12-01 12:59:42 -08:00
Louis Huemiller
0404814194
Remove const_cast to layer handle
...
Change-Id: Ica1e089cb56b5f9f46ab87abf735ffe7237fc926
2010-12-01 12:29:36 -08:00
Eric Laurent
1b8733d913
resolved conflicts for merge of 0d28be68 to master
...
Change-Id: Iec5f810c366d3e1c14a6f6294b0aea4ffb30ae3e
2010-12-01 12:11:10 -08:00
Eric Laurent
54a176320f
am e23212bc: Merge "Fix issue 3142808." into gingerbread
...
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
Fix issue 3142808.
2010-12-01 11:28:54 -08:00
Daniel Sandler
061b61046d
Merge "Slightly more legible background for notification panel."
2010-12-01 11:27:10 -08:00
Eric Laurent
4db2fd929a
Merge "Fix issue 3142808." into gingerbread
2010-12-01 11:26:37 -08:00
Daniel Sandler
505cd0728e
Merge "When peeking at a notification, the X will close the window."
2010-12-01 11:25:39 -08:00
John Wang
540eca1b9b
am ae2a4419: am 4567847d: Add "canDial" check.
...
* commit 'ae2a44191188cde1dc4a1bbb0134d775f0dc4126':
Add "canDial" check.
2010-12-01 11:20:56 -08:00
Irfan Sheriff
f79f276ab0
am 869fa653: (-s ours) resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
...
* commit '869fa653e0880fc1f389eb51524bef5183bf713e':
DO NOT MERGE Fix status fetch from supplicant
2010-12-01 11:20:52 -08:00
Guang Zhu
b914985cdd
Merge "enabled hardware acceleration for DRT"
2010-12-01 11:19:28 -08:00
Chet Haase
786e4177b5
Merge "Add methods to AnimatorSet that take collections"
2010-12-01 11:15:39 -08:00
John Wang
cec24879b4
am 4567847d: Add "canDial" check.
...
* commit '4567847d461afac08a80518637a0e48eff3c5247':
Add "canDial" check.
2010-12-01 11:10:42 -08:00
Dianne Hackborn
c9bc85bae3
Merge "Implement issue #3201795 : Improve transition when keyboard comes up"
2010-12-01 11:02:04 -08:00
James Dong
265662bbf0
Merge "Add preferred preview size support in the camera framework"
2010-12-01 11:01:00 -08:00
Xavier Ducrohet
5f348ab1fe
Merge "LayoutLib: get AWT image from new image factory."
2010-12-01 10:48:56 -08:00
Irfan Sheriff
2f28b822da
resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
...
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
2010-12-01 10:40:05 -08:00
Irfan Sheriff
a29e6d9620
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
2010-12-01 10:17:56 -08:00
Irfan Sheriff
eaa353bb7b
am f38b709e: (-s ours) am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'f38b709e470849943befbe88a0daeb7324f5114b':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:55:41 -08:00
Irfan Sheriff
d8567ca26c
am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
d4d5dab12f
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
2010-12-01 09:51:27 -08:00
Jean-Baptiste Queru
6c48212132
Merge "Fix crash by "adb shell pm list permissions -f|-s""
2010-12-01 09:47:14 -08:00
Brad Fitzpatrick
d4c5200442
am 7e5cd796: (-s ours) am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '7e5cd7968356ea111988a372095e352d76476994':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 09:22:04 -08:00
Hung-ying Tyan
44cb5f4600
am 6034f9b2: am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '6034f9b2664799cb4f983657a78023b49efff825':
Fix race between ending and answering a SIP call.
2010-12-01 09:21:45 -08:00
Hung-ying Tyan
7b4fe96bf4
am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
...
* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
Do not suppress error feedback during a SIP call.
2010-12-01 09:21:36 -08:00
David Brown
5e96c09248
am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
...
* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
Reduce the outrageous verbosity of CallerInfo.toString().
2010-12-01 09:21:22 -08:00
Mathias Agopian
8adc279159
am 3248b484: am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync
...
* commit '3248b484a246f18853c284d6705b1cb9c2e52d77':
fix [3237242] sensormanager sensor active count gets out of sync
2010-12-01 09:21:09 -08:00
Mathias Agopian
98caa36a4c
am be0ece6f: am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
...
* commit 'be0ece6f855ee2ab52309b6633def90ddeab38ee':
allow rotation-vector to have 4 components
2010-12-01 09:21:04 -08:00
David Brown
5108d57ff3
am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
...
* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-12-01 09:20:58 -08:00
Brad Fitzpatrick
994caa76a1
am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
e5f05b8739
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Cary Clark
961bd79012
Merge "start drag of text selection on initial press"
2010-12-01 08:34:58 -08:00
Jean-Baptiste Queru
459ae1107f
Merge "Fix HTTP redirect missing statuscode 303 and 307"
2010-12-01 08:25:12 -08:00
Dan Bornstein
dcce25d675
Merge "Get rid of vm-internal constants."
2010-12-01 07:43:48 -08:00
Dan Bornstein
9a90cd4993
Merge "Dalvik opcode-related fixes."
2010-12-01 07:43:39 -08:00
Iain Merrick
1b9da6c471
Merge "Add FlushCookieStore() method to CookieManager (Java side)"
2010-12-01 06:46:48 -08:00
Andreas Huber
8c36126f28
am b460779c: (-s ours) am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
...
* commit 'b460779cff97f2619e22911264350f5dbb7e76bc':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
2010-12-01 03:38:06 -08:00
Mathias Agopian
f7bc0bce61
am 4b7de2c8: am 66cff624: Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
...
* commit '4b7de2c8de1427f27fc4b362c0c5997932826c16':
Uses 4-th order low-pass for extracting gravity.
2010-12-01 03:38:00 -08:00
Andreas Huber
8dae760f1e
am 9157478d: (-s ours) am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
...
* commit '9157478dcfb624a57e2ee83fb3cffd0bb2f72685':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
2010-12-01 03:37:55 -08:00
Mathias Agopian
62f53bf5a1
am e3895b6f: am 24754c9f: Merge "don\'t attempt to normalize the rotation vector" into gingerbread
...
* commit 'e3895b6ff2eca41c7a1e764e88af0591cbffa560':
don't attempt to normalize the rotation vector
2010-12-01 03:37:40 -08:00
Robert Ly
bd31fa97e7
am 7fac762d: am d06010c3: Merge "Doc change: updating ndk download and overview page" into gingerbread
...
* commit '7fac762d1b53e5b8fb30a60f4d043c13d334d4f3':
Doc change: updating ndk download and overview page
2010-12-01 03:37:34 -08:00
Scott Main
83d41e3efc
am 2eaa846e: am 54d21dad: docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
...
* commit '2eaa846ed34bded6889df5bce96cc17abc296cee':
docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
2010-12-01 03:37:26 -08:00
Andreas Huber
a98eae1538
am aeaa3b3c: am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
...
* commit 'aeaa3b3c6ad004b9a13fc9d48c924c77042e8c22':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2010-12-01 03:37:19 -08:00
Eric Laurent
9bf75328d4
am 371ed722: am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '371ed72216789505acadfac3f2e905dafb04f6e0':
Update java doc for visualizer FFT capture.
2010-12-01 03:37:07 -08:00
Andreas Huber
e0f66ea189
am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-12-01 03:37:00 -08:00
Dirk Dougherty
4191ea8c1c
am fb9612ba: (-s ours) am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit 'fb9612ba98f29b794244323cab6f56204d072eeb':
Do not merge: Doc change: API diff report for gingerbread.
2010-12-01 03:35:02 -08:00
Dirk Dougherty
6ec8805d43
am ba5d11bd: (-s ours) am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit 'ba5d11bdba42ea1e38eb66a347c932ce6d0b8633':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-12-01 03:34:55 -08:00
Eric Fischer
02f1191c1f
am 30a0e0db: (-s ours) am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '30a0e0db71525948682eda574786fff3e77343b6':
Import revised translations. DO NOT MERGE
2010-12-01 03:34:48 -08:00
Wink Saville
6d97576b9b
am 2ebb3a2d: (-s ours) am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit '2ebb3a2d9b31213ced141c1807f60e13983f40dd':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-12-01 03:34:39 -08:00
Ben Murdoch
6a9fa5fa73
resolved conflicts for merge of d2607118 to master
...
Change-Id: Id6092a762af775e9b5db390feaba3e10bd98ef7c
2010-12-01 10:55:18 +00:00
Hung-ying Tyan
930f716d99
am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
Fix race between ending and answering a SIP call.
2010-11-30 23:21:40 -08:00