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
bf9f3ea72e
Merge 34afc2cd from gingerbread-plus-aosp
...
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -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
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
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
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
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
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
Brian Muramatsu
910be3e855
am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
...
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
Fix TextUtils#commaEllipsize
2011-01-28 14:53:07 -08:00
Brian Muramatsu
9eaefb8213
Merge "Fix TextUtils#commaEllipsize" into honeycomb
2011-01-28 14:51:10 -08:00
Robert Greenwalt
e12aec941d
Add some network types that OEM's are asking for.
...
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Romain Guy
571a2c971b
am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
...
* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
Prevent crash when detaching a SurfaceView. Bug #3400461
2011-01-28 14:20:01 -08:00
Romain Guy
b0c939adfa
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
2011-01-28 14:17:45 -08:00
Dianne Hackborn
1ec7e20237
Fix issue #3403539 : WordPress crashes on Honeycomb
...
Change-Id: Ia86e26b5bd266d8e3362a04e412a58b98a062d5f
2011-01-28 14:11:17 -08:00
Gilles Debunne
06cedc1c4a
am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb
...
* commit 'd11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
Fix for TextView's error popup behavior when using soft keyboard.
2011-01-28 14:10:08 -08:00
Gilles Debunne
d11f5d2c5e
Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb
2011-01-28 14:07:12 -08:00
Joe Onorato
d6874a105e
am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
...
* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
Make keyguard also ask to turn the back button off, now that it is controlled separately.
Allow independent control of the back and the other navigation buttons.
Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:43:22 -08:00
Joe Onorato
b940659f41
am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:43:17 -08:00
Joe Onorato
cfd0bafdeb
Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
...
* changes:
Make keyguard also ask to turn the back button off, now that it is controlled separately.
Allow independent control of the back and the other navigation buttons.
Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:40:45 -08:00
Joe Onorato
94eb3d0f7e
Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
2011-01-28 13:40:28 -08:00
Dianne Hackborn
8691b7243d
am 10e4148b: Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
...
* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader
2011-01-28 12:46:51 -08:00
Dianne Hackborn
10e4148b62
Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
2011-01-28 12:44:52 -08:00
Dianne Hackborn
420829ef78
Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader
...
The framework had started using the LayoutInflator's factory
for itself, which breaks apps that want to use it. Add a hack for
the framework to insert its own private factory.
Also fix a deadlock in the system process.
Change-Id: Iaf80186a5d7e4029faf89e968e184abdaabe514a
2011-01-28 12:21:54 -08:00
Romain Guy
01d5edc49a
Prevent crash when detaching a SurfaceView.
...
Bug #3400461
Change-Id: I837d9d47b12bc5a8798b6dbb720de43b7539c3bc
2011-01-28 11:28:53 -08:00
Leon Scroggins
f53e31551a
am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb
...
* commit 'e891a115a01d377dc17c0dd658ba23fb5d033e23':
Only send a direction key if we are not in touch mode.
2011-01-28 10:34:14 -08:00
Leon Scroggins
e891a115a0
Merge "Only send a direction key if we are not in touch mode." into honeycomb
2011-01-28 10:32:35 -08:00
Chet Haase
97908283c8
am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb
...
* commit 'fe38b7b79325782f682365ec9d1b8fe2932eec78':
Fix artifact with clipped webview content
2011-01-28 10:18:39 -08:00
Chet Haase
fe38b7b793
Merge "Fix artifact with clipped webview content" into honeycomb
2011-01-28 10:16:54 -08:00
Leon Scroggins
572ba78202
Only send a direction key if we are not in touch mode.
...
Bug:3395047
requestFocus() sends a direction key, in case the user
focused the WebView using that direction key. However,
in touch mode, the user used touch to give focus, so
do not send a directional key.
Change-Id: I052d30639d1caefd39077b0498a1e0d21c157a9a
2011-01-28 11:26:45 -05:00
Ben Murdoch
306e96c0dd
am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
...
* commit 'c38b7c820af52c4d5f6f51c750136d18d9897e5e':
Implement the double tap to zoom animation with HW accleration.
2011-01-28 02:35:22 -08:00
Ben Murdoch
c38b7c820a
Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
2011-01-28 02:27:38 -08:00
Chet Haase
91fc3cf3b6
Fix artifact with clipped webview content
...
We were incorrectly calculating the webview viewport in cases
where the viewport was clipped. We now pass down null for the
viewport, which is an indicator for the native code to noop
drawGL calls with a null viewport.
Change-Id: Iecf191eb447869819e357a15a360f0f08c47c273
2011-01-28 00:20:04 -08:00
Dianne Hackborn
f1a9ab2673
am d23316bc: Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
...
* commit 'd23316bc8b49f269e5adcc91eae5698549faa0a3':
Maybe fix issue #3358322 : Status and nav bar died while watching youtube
2011-01-27 22:50:52 -08:00
Dianne Hackborn
6a11185b92
am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:48:32 -08:00
Dianne Hackborn
d23316bc8b
Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
2011-01-27 22:47:50 -08:00
Dianne Hackborn
c8c3021ac3
Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
2011-01-27 22:46:44 -08:00
Joe Onorato
6478adc6b4
Allow independent control of the back and the other navigation buttons.
...
Bug: 3363046
Change-Id: Icc312fc9ffbf2f584dc541489c9769b07ed50315
2011-01-27 21:41:30 -08:00
Joe Onorato
7bb8eeb90c
Allow the status bar disable flags to be used as View's system ui visibility fields.
...
Bug: 3363046
Change-Id: I50ba06ed9a4d2f5d0e0c807437aea9900f44fee9
2011-01-27 21:41:24 -08:00
Joe Onorato
857fd9b856
Plumb whether an input view is actually visible or not through from the IME
...
to the status bar.
Bug: 3391067
Change-Id: I049531155bf7ee0b29874916c0b5b0a45b73c09e
2011-01-27 21:19:46 -08:00
Adam Cohen
aed413a18c
am e31ecf61: Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
...
* commit 'e31ecf61042171242e6f31f22df7691c40f189b2':
Fixing static StackView scenario (Issue: 3399844)
2011-01-27 20:06:09 -08:00
Adam Cohen
e31ecf6104
Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb
2011-01-27 20:04:21 -08:00
Svetoslav Ganov
5e83d0f58b
am 86471d00: Merge "Accessibility support to NumberPicker, DatePicker, and TimePicker" into honeycomb
...
* commit '86471d00f6637dc2c839b2df2a0df511b1ac4dc7':
Accessibility support to NumberPicker, DatePicker, and TimePicker
2011-01-27 18:17:54 -08:00