Carl Shapiro
76afe3e5cd
Merge "Remove dead code referencing an obsolete interface." into honeycomb
2011-01-21 16:11:40 -08:00
Carl Shapiro
8f995b5f6d
Remove dead code referencing an obsolete interface.
...
Bug: 3378919
Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91
2011-01-21 16:10:08 -08:00
Andreas Huber
1c7ae5ac57
am d34b7aab: (-s ours) am 66e35c24: (-s ours) am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
...
* commit 'd34b7aab38503a743e06f7e4e2c974e4d9716984':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-21 16:08:34 -08:00
Nick Pelly
a53086c088
am 5cfbda15: resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
...
* commit '5cfbda15425d078224405950c4be92471279f917':
Change signature of MifareClassic.authenticate*() to throw IOException.
2011-01-21 16:05:47 -08:00
Andreas Huber
d34b7aab38
am 66e35c24: (-s ours) am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
...
* commit '66e35c240e6105934e76cabfafed385f95f013ba':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-21 16:04:56 -08:00
Adam Powell
61d4504ec6
am a4f8e903: am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
...
* commit 'a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1':
Fix bug 3362680 - calendar crash while tabbing among views
2011-01-21 15:56:08 -08:00
Nick Pelly
405a32ac23
am c971d5ed: am 82160444: am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
...
* commit 'c971d5ed8e2c8674152f9292a890558535a7268a':
Support for TagLostException (API).
2011-01-21 15:53:43 -08:00
Brad Fitzpatrick
9b39ddf94c
am fd2bd1a0: am 6b2b053b: am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
...
* commit 'fd2bd1a021fa926a3c4a6099b0a2b52146c16340':
Watchdog can get deadlocked on activity manager
2011-01-21 15:53:36 -08:00
Nick Pelly
3965ebbb03
am 274ee68d: am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit '274ee68d32237d95f05c269c250146d9b3202fbc':
Fix javadoc which broke build.
2011-01-21 15:53:31 -08:00
Adam Powell
a4f8e903c3
am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
...
* commit '5fc3c84f5c465d3f0f435037bd5b92fa8da1f2c2':
Fix bug 3362680 - calendar crash while tabbing among views
2011-01-21 15:52:12 -08:00
Nick Pelly
c971d5ed8e
am 82160444: am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
...
* commit '8216044435d066a6279d1a733b919156bdc9325f':
Support for TagLostException (API).
2011-01-21 15:50:54 -08:00
Brad Fitzpatrick
fd2bd1a021
am 6b2b053b: am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
...
* commit '6b2b053b5adf2d4f8f0defde58310a51dfb7e1e0':
Watchdog can get deadlocked on activity manager
2011-01-21 15:50:45 -08:00
Nick Pelly
274ee68d32
am ccc9a9e5: am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
...
* commit 'ccc9a9e58247d174d587dee465868a948a07364f':
Fix javadoc which broke build.
2011-01-21 15:50:20 -08:00
Eric Laurent
d243ef29d0
am 3bf0f9a7: Merge "resolved conflicts for merge of 9ffe8338 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '3bf0f9a77fa073cdd50b3bb5504b60d5d1effdae':
Fix omission in NOTICE file.
2011-01-21 15:50:04 -08:00
Adam Powell
5fc3c84f5c
Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
2011-01-21 15:49:46 -08:00
Jaikumar Ganesh
6632362a8a
am 32064b67: am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit '32064b6727127e275be23eb2eed18eabe84ee3b2':
Temporary Changes for certification of SCO.
2011-01-21 15:47:59 -08:00
Eric Laurent
3bf0f9a77f
Merge "resolved conflicts for merge of 9ffe8338 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-21 15:47:56 -08:00
Eric Laurent
fd5651c360
resolved conflicts for merge of 9ffe8338 to honeycomb-plus-aosp
...
Change-Id: I0fe9b61a2003566f7d66189a9d83ad5dd879fd7a
2011-01-21 15:46:05 -08:00
Jaikumar Ganesh
32064b6727
am c4cc3ea4: Merge "Temporary Changes for certification of SCO." into honeycomb
...
* commit 'c4cc3ea48add3b7a63a1a97fc3a4c89b24217604':
Temporary Changes for certification of SCO.
2011-01-21 15:45:54 -08:00
Jaikumar Ganesh
c4cc3ea48a
Merge "Temporary Changes for certification of SCO." into honeycomb
2011-01-21 15:43:42 -08:00
Jeff Brown
0f0fdda8c4
am 2866b229: am 75a0e448: Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
...
* commit '2866b22971a1aff0cb88cfef080e93a13fb4fddb':
Optimize call to drawBitmap during screen rotation.
2011-01-21 15:34:27 -08:00
Jeff Brown
e3fbf59683
am ea5e0bb3: am cab11490: Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
...
* commit 'ea5e0bb358990c05f9b07a6aee9047ea398c4f43':
Reduce number of calls to updateInputWindows by 60%.
2011-01-21 15:34:23 -08:00
Adam Powell
3cb8b638c4
Fix bug 3362680 - calendar crash while tabbing among views
...
Remove pending click callbacks when a view is detached from its
window.
Change-Id: I51de184b8e95dbd594675ea6849647586a7c4ba2
2011-01-21 15:34:14 -08:00
Carl Shapiro
4abc384849
am 17066b8f: am 8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
...
* commit '17066b8fb2ffe0bc197f397497942b1d96570fe1':
Perform orthogonal rotations without using a Skia canvas.
2011-01-21 15:34:14 -08:00
Carl Shapiro
aeadb0d5e6
am 48e8ec61: am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb
...
* commit '48e8ec611a6ce4d5fa23830b1ebd24cfbc1c84f2':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
2011-01-21 15:34:06 -08:00
Nick Pelly
8dd7a54136
am a4f26c3d: am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit 'a4f26c3d034885f1d9063f484f44e8c78c8495eb':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:34:00 -08:00
Mathias Agopian
3ca816c132
am 80f3376b: am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit '80f3376b3a0f9c677c37c98382d1021bed6c5633':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:33:56 -08:00
Amith Yamasani
4e82e33166
am d75ee6f1: am 7c93e52f: (-s ours) am 68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
...
* commit 'd75ee6f13aca098f5200e81cc339e7ca70dff01d':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
2011-01-21 15:33:51 -08:00
Gilles Debunne
9543e3e12b
am 48617a51: am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit '48617a51346af3463e10a7236fe5043787ed5db4':
Tapping inside an EditText should always pop up the IME.
2011-01-21 15:33:22 -08:00
Jeff Brown
2866b22971
am 75a0e448: Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
...
* commit '75a0e44831d08d9cbfec9f150be4e78b2d1aabf5':
Optimize call to drawBitmap during screen rotation.
2011-01-21 15:31:38 -08:00
Jeff Brown
ea5e0bb358
am cab11490: Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
...
* commit 'cab114906df621d77bf59d9492f89182e34cd3e4':
Reduce number of calls to updateInputWindows by 60%.
2011-01-21 15:31:31 -08:00
Nick Pelly
5cfbda1542
resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
...
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
2011-01-21 15:30:32 -08:00
Jeff Brown
75a0e44831
Merge "Optimize call to drawBitmap during screen rotation." into honeycomb
2011-01-21 15:29:46 -08:00
Jeff Brown
cab114906d
Merge "Reduce number of calls to updateInputWindows by 60%." into honeycomb
2011-01-21 15:29:39 -08:00
Jaikumar Ganesh
75c2701454
Temporary Changes for certification of SCO.
...
Bug: 3349475
Change-Id: I555b127a1d9218494cd05c07c9e9f29628f3bc74
2011-01-21 15:17:23 -08:00
Adam Powell
84abcfb32d
Fix bug 3374792 - Default holo dark activity background is badly
...
dithered at full size
Fix bug 3357191 - Need holo star assets
Fix bug 3357255 - Need expandable list item arrow assets
Fix bug 3373538 - Holo button padding settings difficult to work with
- remove hard padding from holo button styles. This also adds explicit
'small button' holo assets.
Fix bug 3362311 - PopupMenu with just one item has broken borders -
fix 9-patches.
Fix bug 3357195 - Need holo toggle button assets
Change-Id: I9aad9487960dc9f7e7671431ff753a6dde10908a
2011-01-21 15:16:28 -08:00
Carl Shapiro
17066b8fb2
am 8dac54c5: Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
...
* commit '8dac54c5855cdb3334ea31ff1b5f04972515ff7f':
Perform orthogonal rotations without using a Skia canvas.
2011-01-21 15:12:14 -08:00
Carl Shapiro
8dac54c585
Merge "Perform orthogonal rotations without using a Skia canvas." into honeycomb
2011-01-21 15:09:56 -08:00
Carl Shapiro
48e8ec611a
am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb
...
* commit '366d15d5425aaa090d9c1a1d7273f13e2c85c43b':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
2011-01-21 15:08:04 -08:00
Carl Shapiro
366d15d542
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."" into honeycomb
2011-01-21 15:05:26 -08:00
Nick Pelly
a4f26c3d03
am 4d3ac03a: am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
...
* commit '4d3ac03ade6184504ad3881def5e86133ae5f2f6':
hange the default IsoDep timeout to 300ms (docs update).
2011-01-21 15:03:19 -08:00
Mathias Agopian
80f3376b3a
am b92a40eb: am 12d014fd: Merge "fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
...
* commit 'b92a40ebfaf49783f942b75b413e1499e149c3bb':
fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE
2011-01-21 15:02:26 -08:00
Amith Yamasani
d75ee6f13a
am 7c93e52f: (-s ours) am 68153821: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
...
* commit '7c93e52fac25fb76a67a82f1ccaa4ff6ad42e6ed':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true.
2011-01-21 15:02:18 -08:00
Fabrice Di Meglio
795f135a08
Fix bug #3338957 (Account Picker and Account type picker need love)
...
- update UI to match design requirements
Change-Id: Idb5dbea876eb7170a8c1f077a99cfe168d41f1e1
2011-01-21 14:58:02 -08:00
Gilles Debunne
48617a5134
am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
...
* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
Tapping inside an EditText should always pop up the IME.
2011-01-21 14:55:50 -08:00
Gilles Debunne
b5e5b2d99b
Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
2011-01-21 14:53:44 -08:00
Carl Shapiro
d6c276a5ef
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
...
This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c.
Bug: 3378444
Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
2011-01-21 14:52:51 -08:00
Amith Yamasani
54468ba12e
am 610dff54: am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit '610dff54fc6f350e1f7976027bb69a813fa055af':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:51:34 -08:00
Michael Kolb
caed391640
am b2b83077: am debb5bbe: Merge "Add public API for on screen zoom controls" into honeycomb
...
* commit 'b2b830774f4aff0bacf30648a4f7efce49e403fd':
Add public API for on screen zoom controls
2011-01-21 14:51:26 -08:00
Amith Yamasani
610dff54fc
am b58b5db4: Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME." into honeycomb
...
* commit 'b58b5db4ba8edc075f6524df200aa8d3c678e267':
Set the default state of NOTIFICATIONS_USE_RING_VOLUME.
2011-01-21 14:49:34 -08:00