11185 Commits

Author SHA1 Message Date
Nick Pelly
cd0e839a24 NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 18:35:29 -07:00
Scott Main
dbb78f0e4e am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d'

* commit '81df9841c64e417fe2adfab0e8d694af09e07c0d':
  docs: fix typo; surface dev guide link in package description
2010-10-17 13:49:45 -07:00
Brad Fitzpatrick
da3fe88b2d am 33476b2d: am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit '33476b2db82b5a7f025eb9625fa56f94290e97f4'

* commit '33476b2db82b5a7f025eb9625fa56f94290e97f4':
  Don't crash on null Vibrator during reboot.
2010-10-16 09:13:39 -07:00
Adam Powell
84321b2bed Change AlertDialogs to use button groups.
Ditch dumb prototype implementation of ButtonGroup.

Change-Id: I803ef51b0bf4059936ddeb9145ca37ee53cd24b9
2010-10-15 18:30:22 -07:00
Scott Main
81df9841c6 am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp

* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
  docs: fix typo; surface dev guide link in package description
2010-10-15 18:23:34 -07:00
Jesse Wilson
a85aa6f5df Merge "Fix typos in JSON documentation." 2010-10-15 17:54:30 -07:00
Jesse Wilson
3312b29760 Fix typos in JSON documentation.
Change-Id: Ife519f755b1974adee13553cd4dfa2b15dd23aac
2010-10-15 17:33:54 -07:00
Jeff Brown
3b2b354ec1 Add support for secure system overlays.
Manual merge from Gingerbread.

This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.

Bug: 3098519
Change-Id: Id876736fd8bf332ff9a5428bde59f5268aa49c3a
2010-10-15 17:10:55 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
2010-10-15 17:02:57 -07:00
Gilles Debunne
65f6041006 Fix for broken build with stopTextSelectionMode
Change-Id: I1a235db0a0373fed16b62a85df3a0f1411e412be
2010-10-15 16:18:35 -07:00
Jeff Brown
497a92cc5b Add keycodes and meta-key modifiers to support external keyboards.
Added new key maps for external keyboards.  These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.

One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used.  The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.

The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly.  This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.

Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.

The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...

Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis.  Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.

Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
2010-10-15 16:00:07 -07:00
Jaikumar Ganesh
64144c4474 am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread
Merge commit '096a1e6c83d3638788468dfb21a3b4662745d617'

* commit '096a1e6c83d3638788468dfb21a3b4662745d617':
  Check for state before disconnecting.
2010-10-15 14:27:55 -07:00
Gilles Debunne
672a2531ae am 4fa7f4f4: am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread
Merge commit '4fa7f4f4963568258a6b4179176de8386cb5d3db'

* commit '4fa7f4f4963568258a6b4179176de8386cb5d3db':
  Really leave text selection mode when using the trackball.
2010-10-15 14:25:48 -07:00
Ben Komalo
c1d71003fc Merge "Fix Spinners that don't have a hard pixel width set. getDimensionPixelSize -> getLayoutDimension" 2010-10-15 14:10:57 -07:00
Kenny Root
fcab0f5502 am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
Merge commit '8fda1636e3e35f060b9046294efd3c062a1fdb84'

* commit '8fda1636e3e35f060b9046294efd3c062a1fdb84':
  OBB: use PBKDF2 for key generation.
2010-10-15 14:00:58 -07:00
Romain Guy
10aca41e51 Merge "Fix clipping issue in StackView." 2010-10-15 14:00:17 -07:00
Romain Guy
e5ebcb0107 Fix clipping issue in StackView.
Change-Id: I7ec28f25c3993a2bd7ef6399ba1923839d239905
2010-10-15 13:57:28 -07:00
Ben Komalo
bdaa34c670 Fix Spinners that don't have a hard pixel width set.
getDimensionPixelSize -> getLayoutDimension

Change-Id: Ic126955ad7c7cee3aea423c43fc16da02ec9664e
2010-10-15 13:27:11 -07:00
Jaikumar Ganesh
db3694d030 am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread
Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.
2010-10-15 12:44:39 -07:00
Scott Main
2c1dab4483 am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread

* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
  docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Ben Komalo
4138b33826 Merge "Apply values set in "dropDownWidth" attribute of Spinner styles." 2010-10-15 11:55:52 -07:00
Ben Komalo
72536f7240 Apply values set in "dropDownWidth" attribute of Spinner styles.
Bug: 3099224
Change-Id: I904f2ef39a65a62076ff82319128a31767a2394b
2010-10-15 11:42:07 -07:00
Kenny Root
9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master
Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac
2010-10-15 11:20:42 -07:00
Nick Pelly
a851d8d0cf Merge "NFC: Move NFC service implementation out of system_server." into gingerbread 2010-10-15 10:55:11 -07:00
Scott Main
36cdecd89d docs: fix typo; surface dev guide link in package description
Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
2010-10-15 10:19:27 -07:00
Jaikumar Ganesh
72cd64b20e resolved conflicts for merge of bbb90d13 to master
Change-Id: I85de73f6e11e7547a006d41ca49021bca19af14b
2010-10-15 10:02:57 -07:00
Brad Fitzpatrick
33476b2db8 am feebaf35: Merge "Don\'t crash on null Vibrator during reboot." into gingerbread
Merge commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6' into gingerbread-plus-aosp

* commit 'feebaf35c0edaed87edc6eb33a33ad9df1a209d6':
  Don't crash on null Vibrator during reboot.
2010-10-15 08:51:01 -07:00
Kenny Root
733e79c240 am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'

* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
  OBB: Change documentation to reflect reality
2010-10-15 08:32:30 -07:00
Nick Pelly
bc21fdefdf NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.

NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().

**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().

Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.

Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:12:32 -07:00
Wink Saville
b079a10652 am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.
2010-10-15 00:07:40 -07:00
Leon Scroggins
af95d12b12 am c7ee44cb: am dfc07279: Line up WebTextView text with the page.
Merge commit 'c7ee44cbe155c2272687a0e82133f3e729eac137'

* commit 'c7ee44cbe155c2272687a0e82133f3e729eac137':
  Line up WebTextView text with the page.
2010-10-14 23:03:23 -07:00
Jaikumar Ganesh
c8e87e3ce6 am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7'

* commit '373a69614e534ae04dddd79c92933b6d8969fad7':
  Bluez doesn't handle disconnect while connecting well.
2010-10-14 21:19:04 -07:00
Brad Fitzpatrick
e331644cb5 Don't crash on null Vibrator during reboot.
Bug: 3099305
Change-Id: I9af126f7a719f36ae544f517a2fccd0d33339389
2010-10-14 20:53:06 -07:00
Nick Pelly
f36c6db108 NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>

Conflicts:

	Android.mk
	CleanSpec.mk
	core/java/android/app/ContextImpl.java
2010-10-14 19:16:35 -07:00
Daniel Lehmann
c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
2010-10-14 18:34:17 -07:00
Daniel Lehmann
d16f7588a8 Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread 2010-10-14 18:31:16 -07:00
Chris Tate
6b3912865c Drag thumbnail fixes / improvements
* Properly wipe the thumbnail canvas before handing it to the app for
  its contents to be drawn

* Provide a getView() method in DragThumbnailBuilder that allows
  clients or subclasses to get at the associated view.  This is
  especially for clients that want to draw entire (sub)layouts as
  the drag thumbnail, by overriding onDrawThumbnail(Canvas c)
  like this:

  // Override specifically for drawing a whole ViewGroup into
  // the drag thumbnail canvas
  @Override
  public void onDrawThumbnail(Canvas c) {
      getView().dispatchDraw(c);
  }

Change-Id: Ib43ddd7cf1d44faf2d7f6ba79f102bc3c7f14596
2010-10-14 16:43:39 -07:00
Adam Cohen
6eb4122c2d Merge "Fixing null pointer exception" 2010-10-14 16:29:29 -07:00
Adam Cohen
6f279627cf Fixing null pointer exception
Change-Id: I902dfc9baa1be7fb07110ccde7a3c0e0049e4417
2010-10-14 16:25:23 -07:00
Adam Powell
302166c0fc Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Adam Powell
89edde3efa Holo styling and metrics; holo spinners
Change-Id: Ib6d80e5e1a79b7a4ff208df8dbc097e7b9228d13
2010-10-14 16:20:47 -07:00
Jaikumar Ganesh
5b9895c016 Merge "Disconnect PBAP while disconnecting HFP profile." 2010-10-14 16:18:22 -07:00
Jaikumar Ganesh
2beaf7316f Disconnect PBAP while disconnecting HFP profile.
PBAP profile is associated with HFP profile. Disconnect PBAP
profile while disconnecting HFP profile. We ever never doing this
and were expecting the remote end to do it. So when the user
disconnects a headset, we will end up with the ACL link still up
because PBAP has not been disconnected.

This is little bit of a hack till PBAP profile is converted to
use the new profile APIs.

Change-Id: I04821daae6588955fbfea01472e6a1b6f9212608
2010-10-14 16:14:38 -07:00
Jim Miller
66ad9e7207 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Jim Miller
253a5ef886 Fix 3024528: Add owner info to SecureSettings.
Change-Id: Ibed62aa8881c795f0d48007fc04beac0e9c1d4a0
2010-10-14 15:51:55 -07:00
Chet Haase
3a64f241fe Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Chet Haase
51b3227c2e Remove errant minus sign
Change-Id: I39a76484884615aa86f4a845eb4637467ec5abc7
2010-10-14 14:59:39 -07:00
Shimeng (Simon) Wang
51969178b2 Merge "Remove not-used code." 2010-10-14 14:53:52 -07:00
Shimeng (Simon) Wang
c42f8b8332 Remove not-used code.
issue: 3003933
Change-Id: I3221fb253fe6fbfe9e24368426d7e4a2c1e3502b
2010-10-14 14:52:28 -07:00
Chris Tate
ba7aad209f Merge "Actually draw the drag thumbnail" 2010-10-14 14:44:06 -07:00