30146 Commits

Author SHA1 Message Date
Scott Main
603b475e59 am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '4add7f3ffcebe1564d1e492194817afaf107ac16':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
2011-02-02 16:41:29 -08:00
Scott Main
4add7f3ffc cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2
update OEM driver list with new fujitsu and kyocera

Change-Id: Ice11a179fe6a4eb220509fc784ac6f6af5a2fa5e
2011-02-02 16:32:11 -08:00
Bill Gruber
930189f0f7 am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit 'df71cabbc2f670a4acea91e04f54990a472a56e9':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
2011-02-02 15:46:52 -08:00
Scott Main
cb2d881765 am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
2011-02-02 15:44:29 -08:00
Bill Gruber
df71cabbc2 cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83
Initial posting of in-app billing docs

Change-Id: I26adb5480e556d8f914a3443f1b75c220742245d
2011-02-02 15:42:36 -08:00
Scott Main
2458f2a1cc cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821
add notice about large screen devices and the "mobile" string in user agent

Change-Id: I2e6a3f2c4fced2cf06bb996c1135c042682cdf8f
2011-02-02 15:40:47 -08:00
Scott Main
8b05f6a2af am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '0c1a4d3b51337784583ef39378ca8796bb8b0992':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
2011-02-02 15:16:13 -08:00
Scott Main
0c1a4d3b51 cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680
fix market link on homepage

Change-Id: I1d617c9737e6a3293372bbe70aff0cfa88dfba8c
2011-02-02 15:12:15 -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
f6b2beaabd am 05059b5b: am 8226140c: Merge from gingerbread
* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
2011-02-02 09:56:30 -08:00
Jean-Baptiste Queru
05059b5b35 am 8226140c: Merge from gingerbread
* commit '8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
  fix for supporting 3 digits MNC code
2011-02-02 09:52:24 -08:00
Jean-Baptiste Queru
61b06be285 am 155b0ee0: Merge from open-source gingerbread
* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
  fix for supporting 3 digits MNC code
2011-02-02 09:48:52 -08:00
Jean-Baptiste Queru
8226140cca Merge from gingerbread
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
155b0ee049 Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
049b172b48 Merge "fix for supporting 3 digits MNC code" into gingerbread 2011-02-02 09:44:16 -08:00
Eric Laurent
0990484c3e am 3d4069a2: Allow TTY mode for GSM Phones
* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
  Allow TTY mode for GSM Phones
2011-02-02 08:28:25 -08:00
Sang-Jun Park
ba34751426 fix for supporting 3 digits MNC code
Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)

Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-02 19:12:31 +09:00
Eric Laurent
3d4069a2e0 Allow TTY mode for GSM Phones
TTY mode should not be restricted to CDMA phones as some GSM carriers
support it.
TTY support is enabled by overlaying the tty_enabled boolean property
in packages/apps/Phones/res/values/config.xml

Also corrected wrong comments on TTY methods.

Change-Id: I48dbc2be51c3dcdaedc1838b85134edc7012be3c
2011-02-01 15:25:41 -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
Jean-Baptiste Queru
dbf09feee0 am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit 'eb17d6f51a9776f02be84859b8980a6317abd27c':
  Don't crash zygote if webcore fails to load
2011-02-01 13:02:19 -08:00
Jean-Baptiste Queru
eb17d6f51a Merge "Don't crash zygote if webcore fails to load" 2011-02-01 12:41:55 -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
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
Dianne Hackborn
b04ec6a8a7 am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
  Do not check features in PackageManagerService DO NOT MERGE
2011-01-31 17:55:11 -08:00
Dianne Hackborn
7a7ed2b212 Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 2011-01-31 17:41:54 -08:00
Kenny Root
fa2ae1ad1a Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares
that it uses because this will cause problems in the future when we add
more features that older phones didn't explicitly declare. We must rely
on markets to know about phones and filter them for us to avoid this
situation.

Bug: 3409434
Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
2011-01-31 16:27:38 -08:00
Eric Fischer
3efb315313 am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
  Import revised translations. DO NOT MERGE
2011-01-31 16:18:27 -08:00
Eric Fischer
a019d15b66 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-31 16:08:52 -08:00
Jean-Baptiste Queru
c0e95048b9 Don't crash zygote if webcore fails to load
Change-Id: I88271fb62c0cc7c6d768009a713f20d9dfbfb5eb
2011-01-31 15:43:19 -08:00
Dianne Hackborn
1368454815 am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
* commit 'e6c6b760eb0c1068fdfa656007ec27e482313b58':
  DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
2011-01-31 14:36:02 -08:00
Dianne Hackborn
e6c6b760eb DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
The "resizeable" attribute of supports-screens was never well documented,
so many apps don't set it.  Assuming that if they are explicitly saying
they support large or xlarge screens then they are also implying that they
are resizeable.

Change-Id: Ibce45539d8910dfddb4f548da5464b31ac4a3a89
2011-01-31 13:44:14 -08:00
Eric Fischer
a85afd133f Import revised translations. DO NOT MERGE
Change-Id: I07d18c234d74184a6bc83894a3e874ce1ae782da
2011-01-31 12:17:36 -08:00
Jean-Baptiste Queru
27badee3f5 am a6fb375c: am 056340ac: Merge "stubs"
* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
  stubs
2011-01-31 12:03:59 -08:00
Jean-Baptiste Queru
a6fb375cf7 am 056340ac: Merge "stubs"
* commit '056340ac95f233090990d77266d89aad3b60f913':
  stubs
2011-01-31 11:55:40 -08:00
Jean-Baptiste Queru
056340ac95 Merge "stubs" 2011-01-31 11:32:33 -08:00
Jeff Hamilton
f7176dfbd2 am 113834c5: Commit the final API for level 10.
* commit '113834c5ab30bfc554202d0f3144a662d77f2484':
  Commit the final API for level 10.
2011-01-31 10:05:13 -08:00
Jeff Hamilton
113834c5ab Commit the final API for level 10.
Change-Id: I56140f79ff599c1a9d03c0f53d700df402234bf1
2011-01-31 11:46:29 -06:00
Jean-Baptiste Queru
e97cc7d0b2 am 8a2f3ecc: am 25503f1c: Merge from gingerbread
* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
2011-01-30 16:26:18 -08:00
Jean-Baptiste Queru
1314bdb2b2 am e88fa50b: Merge from open-source gingerbread
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
2011-01-30 16:19:59 -08:00
Jean-Baptiste Queru
8a2f3ecc03 am 25503f1c: Merge from gingerbread
* commit '25503f1c9f0b5f718052b71dc5b21d1c8576d015':
  fix failing thread object run
2011-01-30 16:07:25 -08:00
Jean-Baptiste Queru
25503f1c9f Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
2011-01-30 15:35:17 -08:00
Jean-Baptiste Queru
e88fa50be8 Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
2011-01-30 15:30:03 -08:00
Jean-Baptiste Queru
65aef1517b Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dianne Hackborn
a1f5e82f37 am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"
* commit 'a30063d80c08434ac3c7316f338c6d54110449ab':
  Normalize output from aapt d
2011-01-29 23:04:50 -08:00
Dianne Hackborn
a30063d80c am 25eb0464: Merge "Normalize output from aapt d"
* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
2011-01-29 23:01:20 -08:00
Dianne Hackborn
25eb04642c Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Dianne Hackborn
71bb59f9e6 am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
2011-01-29 22:30:57 -08:00
Dianne Hackborn
c12cdda949 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00