17232 Commits

Author SHA1 Message Date
Andy McFadden
155b552b1d Merge "Fix start-time setreuid complaints." into honeycomb 2011-01-10 12:07:03 -08:00
Nick Pelly
6b9db1d8c8 am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
2011-01-10 12:06:51 -08:00
Nick Pelly
19326cdcbf am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
* commit 'd64d711d457326b503981f7e55ab1448fa23ad9f':
  Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-10 12:06:39 -08:00
Nick Pelly
9293937619 Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread 2011-01-10 12:02:36 -08:00
Nick Pelly
d64d711d45 Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread 2011-01-10 12:02:26 -08:00
Gilles Debunne
d94f8c5055 Stop text selection mode when new text replaces selection.
Rationalized the use of hideControllers and stopSelectionActionMode.

Hiding the selection controller should be done exclusively by stoping text selection
mode.

Bug 3322636

Change-Id: I30b4a651aa5fb5a865d636bec495a2b96ef114cd
2011-01-10 11:29:15 -08:00
Andy McFadden
05554a4ee9 Fix start-time setreuid complaints.
The code was checking errno instead of the return value from the call.
This fixes calls to setreuid(), setregid(), and setpgid().

Bug 3131052

Change-Id: I8b6155bd4fa9b941895b35fed62cfc163b420fff
2011-01-10 11:22:43 -08:00
Leon Scroggins
0efb38b479 am 9cac3c31: Remove the option to use shift to start selection mode.
* commit '9cac3c31d29134f9bf4de10765b81ed45c13d31a':
  Remove the option to use shift to start selection mode.
2011-01-10 11:05:19 -08:00
Leon Scroggins
9cac3c31d2 Remove the option to use shift to start selection mode.
Bug:3329956

Also ensure that keys dispatched while the WebTextView
is attached get sent to the WebTextView.

Change-Id: Icd9125a85929089a6f376b71c1cb40e885264168
2011-01-10 13:57:38 -05:00
Gilles Debunne
917369844f am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
* commit '58f750ad145e6920c1c75bed8b333e54d78f3fed':
  Fix for an NPE in Account settings on long press.
2011-01-10 10:15:48 -08:00
Gilles Debunne
58f750ad14 Merge "Fix for an NPE in Account settings on long press." into honeycomb 2011-01-10 10:12:59 -08:00
Adam Cohen
1613b5ba7b am 4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
* commit '4c8945191c60a92123c3df15a1f0a737a7084449':
  Fixing bug where StackView doesn't clip it's children correctly
2011-01-10 10:08:19 -08:00
Adam Cohen
4c8945191c Merge "Fixing bug where StackView doesn't clip it's children correctly" into honeycomb 2011-01-10 10:06:19 -08:00
Adam Cohen
488672148c Fixing bug where StackView doesn't clip it's children correctly
Change-Id: Icb051fa355c5c1b92f81d56f04efd4f8699c65a4
2011-01-10 10:04:01 -08:00
Gilles Debunne
b0db5940c9 Fix for an NPE in Account settings on long press.
Bug 3333512

Change-Id: Ief79e824b86b964598f00ef74c6b5c61c0730242
2011-01-10 10:00:37 -08:00
Cary Clark
0c62f82bbb am b74e32cc: Merge "add more alt key acceleration in webview" into honeycomb
* commit 'b74e32cc7ded9b26c1ba1e1bcff98fc9e7128562':
  add more alt key acceleration in webview
2011-01-10 09:57:02 -08:00
Cary Clark
b74e32cc7d Merge "add more alt key acceleration in webview" into honeycomb 2011-01-10 09:55:54 -08:00
John Reck
17147ee327 am 36fd7a39: Tweak user agent building to avoid multiple spaces
* commit '36fd7a39caafac26ea3d56ffc924bce0a53092f1':
  Tweak user agent building to avoid multiple spaces
2011-01-10 09:50:53 -08:00
John Reck
36fd7a39ca Tweak user agent building to avoid multiple spaces
Bug: 3211038
 The building of the user agent could previously have multiple sequential
 spaces. This was causing the CTS test to fail.

Change-Id: I13fc76ba6b97ee84dd44461b4d03b6ca70b48cdf
2011-01-10 09:48:13 -08:00
Mike Lockwood
16c1c55f07 am 5e63e251: Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb
* commit '5e63e2515f3f0d2712d80f2cb27f263f8d3d1081':
  Add separate permission and group for access to the MTP USB driver
2011-01-10 09:26:31 -08:00
Mike Lockwood
5e63e2515f Merge "Add separate permission and group for access to the MTP USB driver" into honeycomb 2011-01-10 09:24:46 -08:00
Leon Scroggins
c7fe090d2f am aa6b9f55: Do not show autofill++ or saved form data in incognito mode.
* commit 'aa6b9f55d60702211dd2d08403c7296347f0bd7d':
  Do not show autofill++ or saved form data in incognito mode.
2011-01-10 08:32:56 -08:00
Brad Fitzpatrick
52d7072265 am cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit 'cb8427538dfdc5eae941e377b11bfd11a95fc5a5':
  Closing cursor in finalizer to avoid GREF and fd leak in acore
2011-01-10 08:32:35 -08:00
Cary Clark
a3ee56f4ae add more alt key acceleration in webview
Make key accceleration exact; if alt is required,
allow only alt, and so on.

Also, set the touch point when nav'ing with the arrows
or trackball so that context menus have a point to
work with.

bug:3301564
bug:3241968
Change-Id: I574ce145941e84ac0934efd323d9db71eec11663
2011-01-10 11:20:56 -05:00
Leon Scroggins
aa6b9f55d6 Do not show autofill++ or saved form data in incognito mode.
Bug:2968399

Also do not save the form data in incognito mode.

Change-Id: Ice6a1cb3620b5cf272b6b361ce11f8abef269a89
2011-01-10 11:02:00 -05:00
Cary Clark
297c1acc79 am 8733bea4: Merge "scroll selected text in scrollable layers" into honeycomb
* commit '8733bea4c1631cf1d6758c45d5f2a279f7d66eed':
  scroll selected text in scrollable layers
2011-01-10 07:29:03 -08:00
Cary Clark
8733bea4c1 Merge "scroll selected text in scrollable layers" into honeycomb 2011-01-10 07:25:33 -08:00
Cary Clark
b9aaa776a6 scroll selected text in scrollable layers
Compute whether the initial tap point is in
a scrollable layer or not. If it is, get
the bounds of the scrollable layer and use them,
clipped to the view, to determine when the
select anchor is dragged close to the layer's
edge, to invoke autoscrolling.

Fix some bugs around stopping the autoscrolling
when there is nothing to do, and when a motion
up event is sent.

requires companion change in external/webkit

bug:3191699
Change-Id: Ic9229b063a8102ec93d0cd5bcaba774cc170c106
2011-01-10 09:10:25 -05:00
Mike Lockwood
10bc1114f3 Add separate permission and group for access to the MTP USB driver
Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.

Change-Id: Id03f7c4f3d2712c489b4b74cf17a72a182084501
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 08:54:34 -05:00
Johannes Carlsson
872a52c6b6 Closing cursor in finalizer to avoid GREF and fd leak in acore
The finalize() call did not clean up completely, this eventually
caused the android.process.acore to crash since it ran out of fds
and GREF to increased above 2000 if an application forgot to close
its cursor objects. A warning was also added when this happens so
that application developers can correct their mistake. The
included test case tries to verify that the finalizer works as
expected by creating a bunch of Cursor objects without closing
them (without this fix the acore process crashes after about 400
iterations and the test case ends with "Process crashed").

Change-Id: I11e485cef1ac02e718b2742108aa88793666c31d
2011-01-10 12:46:21 +01:00
Nick Pelly
3dd6c45853 Remove attemptDeadServiceRecovery() from TagTechnology's.
attemptDeadServiceRecovery() is a hack to recover from NfcService dying. It
should be a rare event, and is only needed in NfcAdapter which is a long-lived
object.

TagTechnology objects are transient, it is acceptable for them to go stale
when NFC service dies. Lets not complicate the code with recovery for a rare
event.

Change-Id: I101350e920b075c680eb4f250683f0a2bb878553
2011-01-10 18:14:41 +11:00
Nick Pelly
b4003bf73e Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
The later feels less clumsy.

Change-Id: I50f29aef23d2993dcfd25f4c4f2cb0d77bdc0610
2011-01-10 17:28:03 +11:00
Adam Powell
38f0c2ee8a am 8b50495d: Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb
* commit '8b50495d02a6423bfa5c8cf6406e3e06b7c84f7f':
  Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
2011-01-09 21:39:49 -08:00
Adam Powell
8b50495d02 Merge "Fix bug 3324981 - Inconsistent/buggy FastScroll behavior" into honeycomb 2011-01-09 21:38:05 -08:00
Adam Powell
32c3a6929a Fix bug 3324981 - Inconsistent/buggy FastScroll behavior
The fast scroller now always positions by index position.

Fixed a bug with always-show fast scrollers.

Change-Id: I08586ab2aae9733e78aa823aff711bcc14d2d44d
2011-01-09 21:34:21 -08:00
Jeff Hamilton
e3db3d6209 Merge commit '525f953b' into manualmerge
Conflicts:
	api/current.xml

Change-Id: I6cbde67b8da6b85def6e3ddd985b0e04edf279a7
2011-01-09 21:01:56 -06:00
Romain Guy
b6c4f7904a am 867b1f60: Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb
* commit '867b1f60e6c2fff4650e5edc4409b26c9c605f00':
  Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883
2011-01-09 16:44:14 -08:00
Romain Guy
867b1f60e6 Merge "Better documentation for FLAG_HARDWARE_ACCELERATED Bug #3154883" into honeycomb 2011-01-09 16:42:35 -08:00
Romain Guy
72f0a276ff Better documentation for FLAG_HARDWARE_ACCELERATED
Bug #3154883

Change-Id: I2062781ba3b447b8ec4e0836b9ddeaa97c7aa60e
2011-01-09 16:45:28 -08:00
Mike Lockwood
497e4314b0 am 4c93fbce: Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb
* commit '4c93fbce79de64780696c737424e8c41cbbd06ae':
  Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts
2011-01-09 16:41:07 -08:00
Mike Lockwood
4c93fbce79 Merge "Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts" into honeycomb 2011-01-09 16:39:37 -08:00
Mike Lockwood
3f182381e1 Framework manifest: Remove USB_CAMERA_ATTACHED and USB_CAMERA_DETACHED broadcasts
These broadcasts no longer exist, so remove their <protected-broadcast> elements from the manifest.
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: I4a724509d3058f16283870f02e5e1b51dfb21a43
2011-01-09 19:37:29 -05:00
Brett Chabot
d320877f32 am 3b4fcbc9: Add ActivityManager#isRunningInTestHarness() public API.
* commit '3b4fcbc9f13bab6a2e9e5c37cc5e18fec7341c04':
  Add ActivityManager#isRunningInTestHarness() public API.
2011-01-09 16:35:59 -08:00
Brett Chabot
3b4fcbc9f1 Add ActivityManager#isRunningInTestHarness() public API.
Replaces use of ro.monkey system property. This new API is controlled by
ro.test_harness.

Bug 3329873

Change-Id: Idb5bbbd9ca691976ef842eec681be34c29915976
2011-01-09 16:31:11 -08:00
Adam Powell
92752f7498 am ac0f347e: Merge "Honeycomb styling for the volume panel" into honeycomb
* commit 'ac0f347ed83d53bbfcef7e92acd8b481be044852':
  Honeycomb styling for the volume panel
2011-01-09 16:30:14 -08:00
Adam Powell
ac0f347ed8 Merge "Honeycomb styling for the volume panel" into honeycomb 2011-01-09 16:28:26 -08:00
Adam Powell
3ae2706751 Honeycomb styling for the volume panel
Change-Id: If0c870a07b8116c1b22a199de2021da46d69316b
2011-01-09 16:26:00 -08:00
Jim Miller
b3a82ebd6e am 730f0b23: Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb
* commit '730f0b238a20362ff0ae6bdfbd069f0996fc1b39':
  Fix 3299611: Use system font for AM/PM indicator
2011-01-09 16:10:19 -08:00
Jim Miller
730f0b238a Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb 2011-01-09 16:08:58 -08:00
Jim Miller
81f9b286d1 Fix 3299611: Use system font for AM/PM indicator
This fixes a bug where translations wouldn't pick up the proper
AM/PM indicator because AndroidClock.ttf doesn't contain the
full Android character set for translations.

Change-Id: I61737bae7383946906a4e6b776afa7463da9355d
2011-01-09 16:03:27 -08:00