Jeff Brown
46bfd4a355
resolved conflicts for merge of c608e106 to master
...
Change-Id: I49117966f43080d86763bab51848dbc50e55ecf8
2011-01-30 12:50:09 -08:00
Jeff Brown
c608e106a6
am 3c89f6d1: Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
...
* commit '3c89f6d1bd0821d0ae0205a5b48176156735aaac':
Add "Use physical keyboard" option to system bar IME button.
2011-01-30 12:10:07 -08:00
Jeff Brown
3c89f6d1bd
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
2011-01-30 12:07:49 -08:00
Joe Malin
69aedbedfe
am f5002922: am 51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
...
* commit 'f50029220664be6cc5b2b4c18377b0efa9fe6ca5':
sdk doc change: Copy/Paste/Drag/Drop
2011-01-30 09:55:50 -08:00
Joe Malin
f500292206
am 51990f9b: Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
...
* commit '51990f9b0c7c0a22e1a3440c620ab97ebe4209c9':
sdk doc change: Copy/Paste/Drag/Drop
2011-01-30 09:48:49 -08:00
Joe Malin
51990f9b0c
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
2011-01-30 09:45:59 -08:00
Ken Wakasa
428dbe0181
am 4e3f3a20: am 8710e76a: Follow up change to I741642ac
...
* commit '4e3f3a2046a5743f02ebca665b771467ad900ce1':
Follow up change to I741642ac
2011-01-29 21:46:22 -08:00
Ken Wakasa
4e3f3a2046
am 8710e76a: Follow up change to I741642ac
...
* commit '8710e76a897cd546a79ee4338a4147eeb9f3e068':
Follow up change to I741642ac
2011-01-29 21:42:30 -08:00
Ken Wakasa
8710e76a89
Follow up change to I741642ac
...
Fix wrong constant.
bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
2011-01-30 11:02:09 +09:00
Jean-Baptiste Queru
d2ed82fb94
am 66700397: Merge 3100207b from gingerbread-plus-aosp
...
* commit '66700397496fc6f6d26f9f0b56ead8ef610b9654':
Tweak to make merges easier
2011-01-29 14:54:43 -08:00
Jean-Baptiste Queru
6670039749
Merge 3100207b from gingerbread-plus-aosp
...
Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588
2011-01-29 14:51:17 -08:00
Jean-Baptiste Queru
3100207be5
am 1358b6a4: Tweak to make merges easier
...
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
2011-01-29 14:43:33 -08:00
Jean-Baptiste Queru
1358b6a4fb
Tweak to make merges easier
...
Bug: 3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
2011-01-29 12:54:09 -08:00
Jason parks
450536b6a6
am d4796c82: am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
...
* commit 'd4796c823b92866d5895acf610e5571e9b5724d9':
Update the encryption password when the device password is changed.
2011-01-29 12:06:39 -08:00
Jason parks
d4796c823b
am a2e765ef: Merge "Update the encryption password when the device password is changed." into honeycomb
...
* commit 'a2e765ef1ad2cb907a4ae0a93bb15e4764ebb59a':
Update the encryption password when the device password is changed.
2011-01-29 12:04:11 -08:00
Jason parks
a2e765ef1a
Merge "Update the encryption password when the device password is changed." into honeycomb
2011-01-29 12:02:19 -08:00
Robert Greenwalt
b46062bc08
am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
...
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
Add some network types that OEM's are asking for.
2011-01-29 09:35:28 -08:00
Robert Greenwalt
f8fdec50c7
resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
...
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
2011-01-29 09:32:04 -08:00
Jean-Baptiste Queru
52d3320815
am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp
...
* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
API: Make close() throw an IOException.
2011-01-29 08:50:38 -08:00
Jean-Baptiste Queru
bf9f3ea72e
Merge 34afc2cd from gingerbread-plus-aosp
...
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -08:00
Nick Pelly
e7662123f2
am 7a69ffa0: am 32f7d50d: am 21d0a173: Fix build - javadoc.
...
* commit '7a69ffa0e455cfb990b53d9dffa3b76c590dea0e':
Fix build - javadoc.
2011-01-29 08:35:53 -08:00
Nick Pelly
7a69ffa0e4
am 32f7d50d: am 21d0a173: Fix build - javadoc.
...
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
Fix build - javadoc.
2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
8b10bdb494
am 7d4b7dab: Merge 55e124c4 from gingerbread-plus-aosp
...
* commit '7d4b7dab397fb780873303d60650bf0a0557cf41':
Clean up MifareUltralight API.
2011-01-29 07:38:41 -08:00
Jean-Baptiste Queru
7d4b7dab39
Merge 55e124c4 from gingerbread-plus-aosp
...
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
2011-01-29 07:32:39 -08:00
Robert Greenwalt
aa3866e6fa
am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
...
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
6b739dc729
Merge "Add some network types that OEM's are asking for." into gingerbread
2011-01-29 06:38:35 -08:00
Justin Ho
cf5c0741e7
am a5e92d18: am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
...
* commit 'a5e92d18b045bdf71c0445d34b2bfa775c582ab6':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
2011-01-28 22:55:41 -08:00
Justin Ho
a5e92d18b0
am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
...
* commit '9b1df1646ff4d480eebe2fd9cd394915b7925e92':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
2011-01-28 22:54:11 -08:00
Justin Ho
9b1df1646f
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
2011-01-28 22:51:51 -08:00
Justin Ho
35326b876e
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
...
Change-Id: Ib78eb3f75b7734c0244fbc9ac58c52d2ffbbdb27
2011-01-28 22:49:43 -08:00
Jeff Brown
2992ea782f
Add "Use physical keyboard" option to system bar IME button.
...
Bug: 3391067
Change-Id: I136087ca4f726d0068d5983d7d3686787ba60c55
2011-01-28 22:06:36 -08:00
Joe Onorato
5be5f51c2e
am 7f51171a: am a0f2cdb5: Merge "999" into honeycomb
...
* commit '7f51171ab3afebe9e9695c0991c579bc959a180d':
999
2011-01-28 18:52:26 -08:00
Joe Onorato
7f51171ab3
am a0f2cdb5: Merge "999" into honeycomb
...
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
999
2011-01-28 18:50:03 -08:00
Joe Onorato
a0f2cdb507
Merge "999" into honeycomb
2011-01-28 18:47:57 -08:00
Joe Onorato
c6925ca684
999
...
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
2011-01-28 18:46:20 -08:00
Christopher Tate
9805d8e081
Merge "Enable global (cross-application) drag/drop"
2011-01-28 18:01:56 -08:00
Christopher Tate
251602f410
Enable global (cross-application) drag/drop
...
Also adds a new flag constant, View.DRAG_FLAG_GLOBAL, which indicates that
the drag operation should be allowed to propagate the drag outside the
originating app. When this flag is specified, all visible windows will
be notified about the ongoing drag.
Bug 3322724
Change-Id: Iaa3412a97f83f4e763019c9a03b5f09ebf75453f
2011-01-28 17:54:12 -08:00
Jeff Brown
2c376fc46c
Optimize IntentResolver to reduce lookup time by 50%.
...
IntentResolver frequently iterates over hundreds of different IntentFilters
and spends much of its time creating iterators and comparing strings.
This change avoids reduces the amount of garbage created by eschewing
iterators where possible. The FastImmutableArraySet type on its own
provides a 2.5x speed boost compared to repeatedly iterating over a HashSet.
In absolute terms, during orientation changes we spent about 160ms resolving
11 intents and performing 1129 calls to IntentFilter.match. Now we spend
half of that time.
Change-Id: Ia120e0082c8cf0b572a0317b9ef4a22c766dbad6
2011-01-28 17:34:01 -08:00
Joe Onorato
b6689044e9
am 9fecc19f: am 430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb
...
* commit '9fecc19f97453cc3ef258100f3a8e323011a7e80':
Don't force all views to be asking for lights out just because somebody did.
2011-01-28 16:42:28 -08:00
Joe Onorato
9fecc19f97
am 430dde3e: Merge "Don\'t force all views to be asking for lights out just because somebody did." into honeycomb
...
* commit '430dde3ef3b9b82bfca4ae51e225c6ad88aee514':
Don't force all views to be asking for lights out just because somebody did.
2011-01-28 16:39:44 -08:00
Joe Onorato
430dde3ef3
Merge "Don't force all views to be asking for lights out just because somebody did." into honeycomb
2011-01-28 16:38:01 -08:00
Dianne Hackborn
ff74ecd8db
am 7b7280fd: am 6ec44395: Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
...
* commit '7b7280fd074e598dfa5351cdbef33984b7e36b76':
Fix issue #3403539 : WordPress crashes on Honeycomb
2011-01-28 16:37:13 -08:00
Joe Onorato
957a189bf2
Don't force all views to be asking for lights out just because somebody did.
...
Bug: 3396308
Bug: 3395422
Change-Id: Ic97a689bda12d3b53a6ecace504d411f2beb87d5
2011-01-28 16:36:16 -08:00
Dianne Hackborn
7b7280fd07
am 6ec44395: Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
...
* commit '6ec44395f304a478fb56f20ca5e941514ed0a48e':
Fix issue #3403539 : WordPress crashes on Honeycomb
2011-01-28 16:35:40 -08:00
Dianne Hackborn
6ec44395f3
Merge "Fix issue #3403539 : WordPress crashes on Honeycomb" into honeycomb
2011-01-28 16:34:02 -08:00
Chet Haase
5484ba0c39
am ec5de087: am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
...
* commit 'ec5de0874fb32137c117461e5680c83422fba975':
Fixed LayoutTransition bug moving multiple views
2011-01-28 16:26:43 -08:00
Chet Haase
ec5de0874f
am 691d43c3: Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
...
* commit '691d43c35fb953c2f70830d3ebd890a43b54cae3':
Fixed LayoutTransition bug moving multiple views
2011-01-28 16:23:45 -08:00
Chet Haase
691d43c35f
Merge "Fixed LayoutTransition bug moving multiple views" into honeycomb
2011-01-28 16:19:32 -08:00
Chet Haase
0dfc398424
Fixed LayoutTransition bug moving multiple views
...
The problem was that there can be >1 animation spawned for each
view in a container, if there are multiple events that trigger
a transition. These animations would potentially clobber object
layout values, causing problems as successive animations tried to use those
clobbered values to set up their own animation values.
The fix is to track the created animations and cancel them as future
animations on those same objects get created. This mechanism used to
be in the code (the bug came about when that mechanism went away), but
was removed because of memory leaks of never removing animations that
were set up but never started. The new approach also caches pending
animations, but runs a second aniamtor to delete the entries in that
collection just in case.
Change-Id: If60c7d188712334dea69d0794dc6b4ce29ca6c09
2011-01-28 15:54:37 -08:00
Glenn Kasten
98bf25269d
Merge "Protected surface API"
2011-01-28 15:18:43 -08:00