drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,269 Commits 1 Branch 0 Tags
Commit Graph

12984 Commits

Author SHA1 Message Date
Alon Albert
b79db4cd5c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:24:15 -08:00
Alon Albert
be5f82ab0d Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Alon Albert
c441e4e355 DO NOT MERGE - Clear backoffs on reconnect 
Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
 2011-02-16 10:16:33 -08:00
daniel_tomas
99e267ebcf am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:41:00 -08:00
daniel_tomas
7bcd2c62eb New API added in NfcAdapter to enable/disable SE card emulation 
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
 2011-02-16 09:27:25 -08:00
Nick Pelly
8c8e9d9a7f am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465 Minor doc update. 
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
 2011-02-16 09:18:34 -08:00
Robert Ly
c3ebf27a51 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread 
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package
 2011-02-15 22:54:52 -08:00
Robert Ly
2deeefeb5e Adding package summary for nfc.tech package 
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
 2011-02-15 17:41:47 -08:00
Gilles Debunne
8e28ab22de am 2050de5b: Text selection is broken. 
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
 2011-02-09 16:49:42 -08:00
Gilles Debunne
2050de5b9a Text selection is broken. 
Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
 2011-02-09 14:17:22 -08:00
Jeff Hamilton
c1cc9ba6d1 am 58c9d472: Merge "More documentation updates for NFC." into gingerbread 
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
 2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec More documentation updates for NFC. 
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
 2011-02-09 17:26:47 +09:00
Nick Pelly
47dac545da am 39cf3a44: Document NFC permissions. 
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
 2011-02-08 23:25:29 -08:00
Nick Pelly
39cf3a445e Document NFC permissions. 
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
 2011-02-09 16:10:46 +09:00
Jeff Hamilton
1ac35411f1 am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread 
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
 2011-02-08 19:33:53 -08:00
Jeff Hamilton
584afa8dde Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f Improve the docs a bit for foreground dispatch. 
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
 2011-02-09 12:30:18 +09:00
Eric Fischer
c1c3143347 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
  Import revised translations.  DO NOT MERGE
 2011-02-08 17:32:18 -08:00
Gilles Debunne
63bd55c7bf am cdfe8999: Fix for multiple merge problem. 
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
 2011-02-08 17:31:33 -08:00
Gilles Debunne
e04c14962f resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp 
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
 2011-02-08 16:33:58 -08:00
Eric Fischer
dff2fea9b1 Import revised translations. DO NOT MERGE 
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
 2011-02-07 13:17:26 -08:00
Gilles Debunne
cdfe899991 Fix for multiple merge problem. 
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
 2011-02-04 16:50:01 -08:00
Kenny Root
c4dfa998b7 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:12:14 -08:00
Kenny Root
d2a996173e am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." 
* commit 'c94a99987d8a49ea599c22ffad0e61db591963e0':
  JPtextinput: Dont break emoji characters when cutting strings.
 2011-02-04 16:01:13 -08:00
Gilles Debunne
1ba2a47b82 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 
* commit '893ac28f75561061a8f334cbd4e47833d7fd7843':
  Blinking runnable is created only if text is editable. DO NOT MERGE.
 2011-02-04 15:50:15 -08:00
Gilles Debunne
826fbdf7b6 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 
* commit '8a6ba494a28702e68b0a8fbd8bac34335536a8f8':
  All runnable are stopped on detach. DO NOT MERGE.
 2011-02-04 15:50:12 -08:00
Gilles Debunne
c0728cc042 Double tap triggers text selection in a TextView. DO NOT MERGE 
This is a convenient way to switch to selection mode without the
context menu. Context menu is still available and offerts Select Input method option.

Browser overloads touch events and this feature is not available in Browser which
limits the conflict with double tap zoom in browser.

Change-Id: I286504cf03733d5c2fb9bc01765f713d14bbd2f4
 2011-02-04 15:50:10 -08:00
Gilles Debunne
2f7e9d403a am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 
* commit '53841df2a49bffa53ba3d1e4b0580f4f23a64dc3':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.
 2011-02-04 15:49:56 -08:00
Gilles Debunne
893ac28f75 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread 2011-02-04 15:46:15 -08:00
Gilles Debunne
8a6ba494a2 Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread 2011-02-04 15:46:11 -08:00
Gilles Debunne
53841df2a4 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread 2011-02-04 15:46:06 -08:00
Kenny Root
c94a99987d Merge "JPtextinput: Dont break emoji characters when cutting strings." 2011-02-04 15:42:14 -08:00
Nick Pelly
062443f295 am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '40684946cb00080c1c7424885f49a809816dd26e':
  Fix docs type that broke build.
 2011-02-03 16:32:29 -08:00
Nick Pelly
40684946cb Merge "Fix docs type that broke build." into gingerbread 2011-02-03 16:27:51 -08:00
Nick Pelly
46797ac098 Fix docs type that broke build. 
Change-Id: I5b5a2fc5baf95ace74bf90ff2c750ba890054d64
 2011-02-03 16:23:58 -08:00
Nick Pelly
5394ef0618 am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
  NFC documentation overhaul.
 2011-02-03 15:55:53 -08:00
Nick Pelly
630ac8df24 Merge "NFC documentation overhaul." into gingerbread 2011-02-03 15:23:17 -08:00
Nick Pelly
74fe6c6b24 NFC documentation overhaul. 
Change-Id: I45dca95a24b2d0327e080436fbcc7b1dad79de02
 2011-02-03 15:11:09 -08:00
Jean-Baptiste Queru
4b8ad9effd Merge from gingerbread 
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
 2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
baaaca1c61 Merge ee4c17ee from gingerbread 
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
 2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
ee4c17eec3 Merge from open-source gingerbread 
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
 2011-02-03 12:41:51 -08:00
Irfan Sheriff
ec348b4953 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp 
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
 2011-02-02 14:23:10 -08:00
Irfan Sheriff
0a4b3fd93b two digit number handling in croatia and serbia 
If users dial 92-96, dial them normally and not treat
as USSD

Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
 2011-02-02 14:08:38 -08:00
Jean-Baptiste Queru
066e1e3cc6 am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load" 
* commit 'dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
  Don't crash zygote if webcore fails to load
 2011-02-01 13:12:04 -08:00
Nick Pelly
da20efd99c am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread 
* commit 'cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
  Final final final Gingerbread MR API changes.
 2011-02-01 10:10:42 -08:00
Sang-Jun Park
c5996b9969 Fix delivery report error with PENDING status in SMS 
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.

Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
 2011-02-01 10:05:28 -08:00
Nick Pelly
cbf0983ec9 Merge "Final final final Gingerbread MR API changes." into gingerbread 2011-02-01 09:39:31 -08:00
Nick Pelly
f003e26df9 Final final final Gingerbread MR API changes. 
This is it. I promise.

ACTION_TECHNOLOGY_DISCOVERED -> ACTION_TECH_DISCOVERED
    This was missed in our technology->tech rename.

Hide TagTechnology.reconnect()
    This is used to reset any per-connection state in a tag, by reconnecting
    to it. The first problem is that it belongs on Tag, not TagTechnology. The
    second problem is that it may become redundant once we add Tag.rediscover()
    which will also reconnect to the tag, and will also return a new Tag with
    newly created technologies enumerated. And the third and most significant
    problem is that you can already achieve the same result by just calling
    close() followed by connect().

Hide Tag.createMockTag()
    This API cannot be used reliably. First it requires using int[] for the
    technology list, but those int constants are now hidden. Second it requires
    knowledge of the extras parcel used to fill technology specific data - also
    not public.

Introduce TagTechnology.isConnected()
    Every child class already impelmented this, and given that connect() and
    close() are defined on the interface, then isConnected() should be there
    too.

Modify Ndef.getType to return a string (not int)
    Allows more flexibility in adding new NDEF types. Current public strings are
    org.nfcforum.ndef.type1
    org.nfcforum.ndef.type2
    org.nfcforum.ndef.type3
    org.nfcforum.ndef.type4
    com.nxp.ndef.mifareclassic

Add NdefFormatable.formatReadOnly()
    This allows you to make the tag read-only at the same time as performing
    format and write. It is important because we currently don't have any
    public API to re-enumerate a tag technology list after making a tag
    NDEF compatible, so you can't perform the format as a seperate step
    without physically removing the tag from field and returning it.

Modify Readonly -> ReadOnly

Make Tag class final

Change-Id: Icf306aeb37b936ca3007e4868e99b6baceac4aff
 2011-02-01 09:20:45 -08:00