Commit Graph

15360 Commits

Author SHA1 Message Date
Simon Wilson
df58a1bbf8 am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread
* commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa':
  Attempt to reduce problems from issue #3183612
2011-03-02 18:13:49 -08:00
Simon Wilson
3d79f1ce84 am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread
* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
2011-03-02 18:10:33 -08:00
Simon Wilson
edc68a001c Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00
Mike Lockwood
40bbf9295d DO NOT MERGE: Backport USB accessory support to gingerbread
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 23:09:12 -08:00
Jason Chen
166055b529 am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb
* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
  Bugfixes in StaticLayout. DO NOT MERGE.
2011-03-01 17:57:56 -08:00
Jason Chen
d616d5054f Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb 2011-03-01 17:56:06 -08:00
Jason Chen
a688353928 am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea from master" into honeycomb
* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
  DO NOT MERGE Cherry-pick of cd59febcea from master
2011-03-01 17:54:26 -08:00
Gilles Debunne
22847209c4 Bugfixes in StaticLayout. DO NOT MERGE.
Bug 3422121

Cherry-picked from master's 95472.

With ellipsize, lines starting with a very long word that does not
fit inside the width were simply ignored. Cut the long word instead.

start - widthStart index offset shift in BiDi.

The original ellipsize-end patch that added '...' after the last
word on end-ellipsized lines has been punted in favor of a true
ellipsize support in I.

I believe the StaticLayout calculateEllipsise is a no-op since textwidth <= avail
by construction: fitWidth and okwidth are < outerWidth. The only exception is the
paraEnd != here case in generate (when not a single character fits in width).
This case is exercised by StaticLayoutTest in cts (width of 8 pixels) and revealed
an offset error in widstart.

All in all, it looks like this code was probably never really tested. I tried some
typical text configuration to make sure these changes improved the situation.

Change-Id: I6c2cb26436a21f0f89078c275a89e891f0f23b92
2011-03-01 17:41:23 -08:00
Gilles Debunne
4797f020cd DO NOT MERGE Cherry-pick of cd59febcea from master
AIOOB exception fix in TabWidget

Bug http://code.google.com/p/android/issues/detail?id=15005

The problem was not specific to the legacy theme. The code that first
measure the tab's width with no contraint was incorrectly using the
mImposedTabsWidth array which could not have the right size if a
child was added.

The first measure after a child is added should indeed crash. Could
be investigated. This fix is sure anyway.

Change-Id: If5015aaa2d5574939fd5d6c6362ed6db94d35d4a
2011-03-01 16:46:36 -08:00
Costin Manolache
66d46ac614 am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 12:29:40 -08:00
Costin Manolache
db52ab69f2 Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 2011-03-01 12:25:21 -08:00
Costin Manolache
ef419b2e14 DO NOT MERGE
Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.

This is backward compatible - both new and old authenticators will work with old and new framework,
but the functionality will only be present if both sides support it.

Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
2011-03-01 11:20:06 -08:00
Jaikumar Ganesh
516393faba am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
  Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:27:16 -08:00
Jaikumar Ganesh
9711b9b7aa am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
  Phone crash when old callback func is woken up when enabling BT.
2011-02-28 16:00:01 -08:00
Jaikumar Ganesh
1eefb529c7 Merge "Phone crash when old callback func is woken up when enabling BT." 2011-02-28 15:33:34 -08:00
Mike Lockwood
fc88f94fc3 am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
* commit '6da062a96c6f8126aad450a937144fab4333488f':
  DO NOT MERGE: Clean up USB notifications:
2011-02-28 13:18:02 -08:00
Mike Lockwood
54e96c69d0 am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
  DO NOT MERGE UsbManager: squashed commit of:
2011-02-28 13:17:58 -08:00
Mike Lockwood
f41768c583 am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
  Give system server permission to access USB. DO NOT MERGE
2011-02-28 13:17:54 -08:00
Xavier Ducrohet
b732b7b5e8 am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 10:10:38 -08:00
Xavier Ducrohet
ce57a7f353 am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:51:38 -08:00
Xavier Ducrohet
6504490cde am dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.
2011-02-28 09:16:38 -08:00
Mike Lockwood
f13ec7a3ac DO NOT MERGE: Clean up USB notifications:
Add support for separate USB connected and configuration events

Include both USB connected/disconnected and configuration state
in USB_STATE Intent

Remove redundant USB_CONNECTED and USB_DISCONNECTED Intents
Now we just have the sticky USB_STATE broadcast

Move USB disconnnect rebouncing from Tethering to UsbService

Change-Id: I1dea480f4b0daf14247cf37c5f2060498882c002
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 18:39:26 -08:00
Mike Lockwood
7916432b3c DO NOT MERGE UsbManager: squashed commit of:
USB: Add functions for querying if a USB function is supported and enabled.

Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService

Change-Id: I920a211934d993eab8ce744c1cc7b05342389286
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 18:39:21 -08:00
Mike Lockwood
89e7f9fd70 Give system server permission to access USB. DO NOT MERGE
Change-Id: I8d64bcaf2483eaa8690aef7ee2d1bb8ed9453fbe
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-27 17:50:59 -08:00
Mike Lockwood
1b8956398b am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
* commit '69e19ae15baa5785667dbf45c7a2d508e429099b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
2011-02-26 13:21:20 -08:00
Mike Lockwood
bbd460d76d am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
2011-02-26 13:21:05 -08:00
Mike Lockwood
69e19ae15b DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
BUG: 3402847

Change-Id: Ic731e49b43fa40df6f8b658d8620a99a85c346e6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:22 -05:00
Mike Lockwood
6aea1154ba DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
BUG: 3402847

Change-Id: I7cb199763e8d5386914b4c2173c9e1579b08674c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:00 -05:00
Svetoslav Ganov
f114809031 resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
2011-02-25 12:39:59 -08:00
Svetoslav Ganov
66edf2bb3f am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gingerbread
* commit '9e5b1a49022d08aee8653fd34f3a8cd878618aa5':
  Use different version of CLDR data in DatePicker
2011-02-25 00:09:03 -08:00
Svetoslav Ganov
9e5b1a4902 Merge "Use different version of CLDR data in DatePicker" into gingerbread 2011-02-24 23:56:52 -08:00
Jeff Hamilton
09979bcf73 am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
* commit 'fd34aa8e1386547bcfbaf043f26c054946b92c2b':
  Support for NDEF on iCODE.
2011-02-24 20:43:15 -08:00
Jeff Hamilton
fd34aa8e13 am 5644d0e1: Support for NDEF on iCODE.
* commit '5644d0e18ad847b66a8cb4f185cb28edebe75d88':
  Support for NDEF on iCODE.
2011-02-24 20:30:14 -08:00
Jeff Hamilton
5644d0e18a Support for NDEF on iCODE.
Change-Id: I9ce2ee5e739d34a9047ca494315cbc54b30fefb8
2011-02-24 22:03:20 -06:00
Svetoslav Ganov
ef7ec7a029 Use different version of CLDR data in DatePicker
The ICU CLDR data doesn't use the month abbreviations that are
appropriate for the DatePicker, so use the framework copy of the CLDR
data.

Bug: 2641810
Note: cherry-picked from Honeycomb

Change-Id: I3c045dbfb751b8b7ce6361b5a67407206fc64db1
2011-02-24 15:45:04 -08:00
Alon Albert
c96b669013 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Jason Chen
22577b8d3a am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:03:34 -08:00
Jason Chen
5ff79c3b06 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Dianne Hackborn
9248e95a2f DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
Original change description follows:
-----------------------------------

Implement issue #3326435: Battery stats improvements

Keep track of discharge while screen is on vs. off.

Checkin looks like:

5,0,u,dc,1,1,1,0

The last four numbers are, from left:

- Maximum battery drain over time period.
- Minimum battery drain over time period.
- Battery drain while screen was on.
- Battery drain while screen was off.

Change-Id: Ie3cfe52df29b3f28ba8dc3350abe6cc967c76324
2011-02-23 17:21:09 -08:00
Scott Main
b1eea45a71 am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb
* commit '201959af6e61c148576c77de6cf772456d664251':
  docs: fix sensorevent code snippets bug: 3480932
2011-02-23 16:00:08 -08:00
Scott Main
201959af6e Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 2011-02-23 15:58:13 -08:00
Irfan Sheriff
b0e5326d8c am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'a46a5cba276ee269d227a5e4d69f3891c4349edf':
  DO NOT MERGE No backup of country and sleep policy
2011-02-23 14:38:10 -08:00
Alon Albert
9add122296 DO NOT MERGE - Increasing timeout to 60 sec
This was already done in HC branch in this CL:
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1
This is also related to bug http://b/issue?id=3402863
I first considered increasing the timeout specificaly for our GData client
but when I saw we already accepted a CL for HC that did this at a lower level, I decided
to do that instead.

Bug: 3402863
Change-Id: I7ef2968ecbab3cc0d698a408f2c643c83d333e2f
2011-02-23 13:55:11 -08:00
Irfan Sheriff
ae388dac6d DO NOT MERGE No backup of country and sleep policy
Remove country code and sleep policy setting back up as it
is a device specific setting

Bug: 3481068
Change-Id: Ifc824c1cd3c3706f8cdaf09b06a05a0c94243acb
2011-02-23 13:51:52 -08:00
Scott Main
02be2f1d87 am 2788e4f9: docs: fix some typos
* commit '2788e4f96a3f210192145a340a1d072c70c7bc4f':
  docs: fix some typos
2011-02-23 11:24:42 -08:00
Scott Main
d11ee90b6e docs: fix sensorevent code snippets
bug: 3480932

Change-Id: Id97ca4e0edfb92eaac0f2996bc5e91d757644afb
2011-02-23 10:57:23 -08:00
Scott Main
2788e4f96a docs: fix some typos
Change-Id: I2dc9855f8fe87234d4337351e8bac6c382fb74d2
2011-02-23 10:54:31 -08:00
Alon Albert
a0946d6399 am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
  Support quoted parameters
2011-02-22 21:23:50 -08:00
Alon Albert
1aba843dc3 am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
2011-02-22 21:18:52 -08:00