43050 Commits

Author SHA1 Message Date
Romain Guy
f222956c95 Merge "Correctly set the alpha of a hardware layer before drawing it. Bug #3410819" into honeycomb 2011-02-01 14:00:35 -08:00
Mike Cleron
fb3221bf6d Merge "Assume ARGB_8888 for unknown configs. Bug #3327175" into honeycomb 2011-02-01 14:00:09 -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
Romain Guy
54229ee5eb Correctly set the alpha of a hardware layer before drawing it.
Bug #3410819

Change-Id: I3ebaca2233f4edf5b59d84ec7706555056a1a4b1
2011-02-01 13:05:16 -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
1e19d87c78 am 17bf5e3c: DO NOT MERGE
* commit '17bf5e3ccfe961e6cc967327ab092cfbd6568ddd':
  DO NOT MERGE
2011-02-01 11:50:28 -08:00
Romain Guy
feeea8f07c Assume ARGB_8888 for unknown configs.
Bug #3327175

Change-Id: If712a255ec65014cd2e007de1e4c6a1d67c19250
2011-02-01 11:22:46 -08:00
Nick Pelly
17bf5e3ccf DO NOT MERGE
Cherry-pick from GB to HC, updating 11.xml.

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: Ifa8a17741fcc95776ffdba42f611eadb036aaf2d
2011-02-01 11:12:56 -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
Dheeraj Sharma
dacacb50ed am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb
* commit '22ad6243d7c9081e4f1a13097cfa4638cf42c3fe':
  Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
2011-02-01 09:02:36 -08:00
Dheeraj Sharma
22ad6243d7 Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb 2011-02-01 09:00:42 -08:00
Justin Ho
53e56c362a am 6d134754: Making default upload and download arrows more visible Bug: 3399982
* commit '6d134754ef2839da43e177b555522a5fdcb3aa9c':
  Making default upload and download arrows more visible Bug: 3399982
2011-02-01 08:46:15 -08:00
Justin Ho
6d134754ef Making default upload and download arrows more visible
Bug: 3399982

Change-Id: I0d614c590deb2b30147ae1e64edf2ef551cc1d40
2011-02-01 08:41:01 -08:00
Justin Ho
daa95d679c am 50bd7362: Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb
* commit '50bd7362a184a11b9c220c01662e813672d4d48e':
  Updating Froyo framework assets to Holo style Bug: 3362749
2011-02-01 07:30:11 -08:00
Justin Ho
50bd7362a1 Merge "Updating Froyo framework assets to Holo style Bug: 3362749" into honeycomb 2011-02-01 07:28:04 -08:00
Justin Ho
b83f6987df Updating Froyo framework assets to Holo style
Bug: 3362749

Change-Id: Ibd2042f1dad4ba3fdc96944a2af93b44df1bc839
2011-02-01 07:27:36 -08:00
Kristian Monsen
ff65c9d75c am 8b8f7989: Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
* commit '8b8f79898d5d0a283c481dedda2cc161a5a673b3':
  Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
2011-02-01 07:19:51 -08:00
Kristian Monsen
8b8f79898d Fix for bug 3407633 Cookie not set in CookieManager - DO NOT MERGE
Setting http:// at the start if there is no :// in the url

Change-Id: Idfae4f724808267fe9c8ab3864cfc4305ddac0e7
2011-02-01 15:14:11 +00:00
Dave Burke
508556a837 am 84a34059: Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
* commit '84a34059ebee2258c77a393bba423837155aad2b':
  Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
2011-02-01 05:15:17 -08:00
Dave Burke
84a34059eb Smoother scrolling by preparing offscreen tiles (credit: Ben Murdoch)
Change-Id: If8f6aa38174e742e869bce7144de8db84b2f7150
2011-02-01 13:09:11 +00:00
Dheeraj Sharma
8afee6694b Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
Change-Id: Ice53fb284e029b1d22093048e8343f9ce8d853dd
2011-02-01 00:28:55 -08:00
Jozef BABJAK
06e57b5d46 Fixing possible race condition.
That return statement is effectively a reading of asynchronously modified
field. The reading and writing is elsewhere protected by locking on thread
instance, except this one occurence. Moving 'return' statement into
synchronized block ensures that it reads updated value.

Don't be afraid of deadlock - wait() releases the lock and acquires it
back when notified.

Change-Id: I940c24c04a1a2d4508d14d11b6174ff4fb2ab7d5
2011-02-01 08:53:52 +01:00
Mike Cleron
b118bd1c2b am ad97c1b1: Merge "Remove MeasuredText debug messages" into honeycomb
* commit 'ad97c1b12872042f97414b51cb58484f9a5fd9fd':
  Remove MeasuredText debug messages
2011-01-31 23:25:02 -08:00
Justin Ho
238fb96861 am 7bae4325: Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb
* commit '7bae4325877cfaf19b316157488450eefed6c381':
  Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.
2011-01-31 23:22:53 -08:00
Mike Cleron
ad97c1b128 Merge "Remove MeasuredText debug messages" into honeycomb 2011-01-31 23:22:36 -08:00
Justin Ho
7bae432587 Merge "Enable subclass of SeekBarVolumizer to provide a custom file for sample playback." into honeycomb 2011-01-31 23:20:24 -08:00
Justin Ho
57aa5cbda2 am 0a909a12: Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb
* commit '0a909a12a853f9755da031e8a39b10ca6cc1e9ac':
  Updated notification and effects for Honeycomb Bug: 3389139
2011-01-31 23:18:46 -08:00
Justin Ho
0a909a12a8 Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb 2011-01-31 23:16:58 -08:00
Justin Ho
ad440c9a3f Updated notification and effects for Honeycomb
Bug: 3389139

Change-Id: Ia23748568619bd48d13260e443e2fcd333cde3fc
2011-01-31 23:06:17 -08:00
Joe Onorato
ba426a7e86 am 8f4fe8fe: Merge "When the data flows, the icon glows." into honeycomb
* commit '8f4fe8fe17499362bfa5b922a509fc9c61ca4b71':
  When the data flows, the icon glows.
2011-01-31 22:17:42 -08:00
Joe Onorato
8f4fe8fe17 Merge "When the data flows, the icon glows." into honeycomb 2011-01-31 22:16:02 -08:00
Dheeraj Sharma
537cc3b19d am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb
* commit 'ba2ee6178ec386e838434cef902fb7de34ec6585':
  Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
2011-01-31 22:09:24 -08:00
Romain Guy
65710b4eac am bc71d625: Merge "Don\'t convert 4444 images to 565. Bug #3327175" into honeycomb
* commit 'bc71d62581104b27d8373893c5485958b6f8ca37':
  Don't convert 4444 images to 565. Bug #3327175
2011-01-31 22:07:17 -08:00
Dheeraj Sharma
ba2ee6178e Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb 2011-01-31 22:06:10 -08:00
Romain Guy
f6a362a5f6 Don't convert 4444 images to 565.
Bug #3327175

Change-Id: I46d970e41947278f4c2476b347fd2403fe9a05e8
2011-01-31 22:05:58 -08:00
Romain Guy
bc71d62581 Merge "Don't convert 4444 images to 565. Bug #3327175" into honeycomb 2011-01-31 22:05:34 -08:00
Dheeraj Sharma
178d4f4111 Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
Change-Id: Iddd1b9b2c430439c4bef4f1cf20fb166ac572d60
2011-01-31 21:25:46 -08:00
Justin Ho
c0957f3ce1 am 186d8d36: Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb
* commit '186d8d36d326756ab4f25eaa8a8ed409ed2cce9b':
  Fix bug 3410400 - Holo rating bar assets
2011-01-31 21:02:14 -08:00
Justin Ho
186d8d36d3 Merge "Fix bug 3410400 - Holo rating bar assets" into honeycomb 2011-01-31 20:59:46 -08:00
Joe Onorato
c198bb1db8 When the data flows, the icon glows.
Bug: 3354414
Change-Id: I1734c8f63d02731d7194364ce7cb692d6de820ac
2011-01-31 20:28:59 -08:00
Amith Yamasani
998127c804 Enable subclass of SeekBarVolumizer to provide a custom file for sample playback.
Bug: 3409194
Change-Id: I8a408a69fd14cf9058afe01ac5c46d0f5afc1503
2011-01-31 20:28:03 -08:00
Jason parks
31d3963bd6 am f370391f: Merge "Show the encryption boot animation." into honeycomb
* commit 'f370391f8de68f40e92075d4544ea7ac5ab75ced':
  Show the encryption boot animation.
2011-01-31 19:50:51 -08:00
Jason parks
f370391f8d Merge "Show the encryption boot animation." into honeycomb 2011-01-31 19:48:24 -08:00
Adam Powell
02a30a8ceb Fix bug 3410400 - Holo rating bar assets
Change-Id: I107f7d3eea2f82ee49a906b0409f01afe78e69b9
2011-01-31 19:35:20 -08:00
Chet Haase
0a198c8076 am 2cd52c80: Merge "Fix invalidation issue with actionbar items" into honeycomb
* commit '2cd52c809e52c042ad61067c93a4b5521eadd503':
  Fix invalidation issue with actionbar items
2011-01-31 19:10:06 -08:00
Chet Haase
2cd52c809e Merge "Fix invalidation issue with actionbar items" into honeycomb 2011-01-31 19:08:28 -08:00