Romain Guy
86ed8bfa5e
am 52fcdd01: Merge "Fix documentation" into jb-dev
...
* commit '52fcdd013943954e4baa4542f78557da33bc646b':
Fix documentation
2012-05-18 17:40:37 -07:00
Romain Guy
52fcdd0139
Merge "Fix documentation" into jb-dev
2012-05-18 17:34:42 -07:00
Dianne Hackborn
39af624f31
DO NOT MERGE: Remove a few left-over layout direction things.
...
Change-Id: Id66b171594af939df4716aa0e0baa25fe47eecee
2012-05-18 17:34:06 -07:00
Romain Guy
c301e78c78
am 9579bf82: Merge "Gallery, we need to talk..." into jb-dev
...
* commit '9579bf821ea4c1c5435f8e62973acd9b72c7902c':
Gallery, we need to talk...
2012-05-18 17:33:05 -07:00
Romain Guy
d2aed40a37
Fix documentation
...
Change-Id: Id3a5d3b6b43ce684c2328f046e4991e64e97575a
2012-05-18 17:32:08 -07:00
Romain Guy
9579bf821e
Merge "Gallery, we need to talk..." into jb-dev
2012-05-18 17:29:58 -07:00
Romain Guy
5a418c771d
Gallery, we need to talk...
...
Change-Id: Ie4b62df03c27161565d303d11447e3d7ff3115c4
2012-05-18 17:09:53 -07:00
Romain Guy
1b61dc2eb7
am 43a760ba: Merge "Don\'t crash on Surface.unlockAndPost() but log & try again Bug #6482593 " into jb-dev
...
* commit '43a760ba84a5357bae792a33ad4a0e946f02679c':
Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593
2012-05-18 16:27:20 -07:00
Romain Guy
43a760ba84
Merge "Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593 " into jb-dev
2012-05-18 16:25:41 -07:00
Dianne Hackborn
c5fe47376c
am fb5c3dba: Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
...
* commit 'fb5c3dba4ddac023cfd4cdcabdfdbcf343197c94':
Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
2012-05-18 16:09:51 -07:00
Dianne Hackborn
9beee6ad20
am d51ac09f: Merge "Fix activity resolver, issues #6519130 and #6507239 " into jb-dev
...
* commit 'd51ac09fd7db5d810452138749f9291617c0dbf7':
Fix activity resolver, issues #6519130 and #6507239
2012-05-18 15:59:55 -07:00
Jeff Sharkey
40bd46aefd
am 9cb660fa: Merge "Guard against apps breaking CHOOSER contract." into jb-dev
...
* commit '9cb660fa342488cd8550644b5649436f1f7868ee':
Guard against apps breaking CHOOSER contract.
2012-05-18 15:59:51 -07:00
Dianne Hackborn
bcb7f04a7c
am e312c61f: Merge "Improve fitSystemWindows() documentation." into jb-dev
...
* commit 'e312c61f9320c3feb4cfbfcab781a65ee5a417af':
Improve fitSystemWindows() documentation.
2012-05-18 15:59:48 -07:00
Jeff Sharkey
17bee29b1f
am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev
...
* commit '787c9ec558a06bb8ebcb5a77f5268cedd218fd1b':
Transition from DEV network stats to XT.
2012-05-18 15:59:46 -07:00
Dianne Hackborn
fb5c3dba4d
Fix issue #6440173 : MenuItem.setIcon(Drawable) scaling incorrectly...
...
...when resource is aliased
We were not correctly using the final resolved configuration when
retrieving a drawable through Resources.getDrawable(). (It already
does the correct behavior when going through TypedArray.getDrawable()).
Change-Id: I9032b788b592412178e31e2e6b0181b92c20fe45
2012-05-18 15:51:27 -07:00
Romain Guy
dddcd22b7e
Don't crash on Surface.unlockAndPost() but log & try again
...
Bug #6482593
Change-Id: Ib477b58e2b7a6cb19a87d05f2aa0448e04d82f7c
2012-05-18 15:33:57 -07:00
Dianne Hackborn
d51ac09fd7
Merge "Fix activity resolver, issues #6519130 and #6507239 " into jb-dev
2012-05-18 15:14:41 -07:00
Dianne Hackborn
5320eb8938
Fix activity resolver, issues #6519130 and #6507239
...
6519130: Starting ResolverActivity with no arguments crashes system_server
6507239: ResolverActivity may bypass signature permissions
Change-Id: I64534f781bc6b7eb45e85dbe3a55d351ee28e85c
2012-05-18 15:04:53 -07:00
Jeff Sharkey
9cb660fa34
Merge "Guard against apps breaking CHOOSER contract." into jb-dev
2012-05-18 14:20:02 -07:00
George Mount
4527a8d641
Consider fixed layers when scrolling the edit box.
...
Bug 6147580
Webkit Change: I810891decf0bad682e90f29f0f65c6b765b7d6d6
Change-Id: Idaa538824e611acd64eb5a4ccb7866d3c978a077
2012-05-18 13:56:27 -07:00
Jeff Sharkey
1c29700c5f
Guard against apps breaking CHOOSER contract.
...
Bug: 6520937
Change-Id: I677a644cf7765bbb046f9c82e1ebd8a40968cee6
2012-05-18 13:55:47 -07:00
Dianne Hackborn
e312c61f93
Merge "Improve fitSystemWindows() documentation." into jb-dev
2012-05-18 12:55:05 -07:00
Jeff Sharkey
787c9ec558
Merge "Transition from DEV network stats to XT." into jb-dev
2012-05-18 11:40:42 -07:00
Dianne Hackborn
d5333f9289
Improve fitSystemWindows() documentation.
...
Change-Id: I6528f2530e6514344e454510f2fa037b55daebb7
2012-05-18 11:23:32 -07:00
Matthew Xie
fbeb823031
am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev
...
* commit 'dabb19fcd1b0d7b2c21be37aa0b75df5e35f1d6f':
Increase the setup-sdp delay to cover for all the devices.
2012-05-17 21:52:04 -07:00
Matthew Xie
dabb19fcd1
Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev
2012-05-17 21:49:55 -07:00
Dianne Hackborn
ba910bc004
am cefbeb68: am 20c0cdbb: Merge "Have the stable layout take into account the window\'s fullscreen flag." into jb-dev
...
* commit 'cefbeb683416a2bbc20905f280eaeadb349cb9d9':
Have the stable layout take into account the window's fullscreen flag.
2012-05-17 20:56:51 -07:00
Svetoslav Ganov
e8d879bfee
am 765cbbe7: am a4c1b0a7: Merge "Fixing the build for real." into jb-dev
...
* commit '765cbbe74ff74c743f556e7ff67e6c7bef02363a':
Fixing the build for real.
2012-05-17 20:56:47 -07:00
Svetoslav Ganov
72e15ceb85
am cefd97c8: am e54c5f13: Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
...
* commit 'cefd97c8546d6dca184e8ac9589ab2ff1b795c06':
Exposing some accessiblity actions only for enabled views.
2012-05-17 20:56:37 -07:00
Jim Miller
6bc4959b62
am 7bd926c9: am 5de47b6a: Fix 6398209: Fix glitch in chevron animation in MultiWaveView
...
* commit '7bd926c9ba317189705867f7f153a59a16853390':
Fix 6398209: Fix glitch in chevron animation in MultiWaveView
2012-05-17 20:56:28 -07:00
John Reck
1f00a987ac
am 88b756cd: Merge "Don\'t show the touch highlight for double taps" into jb-dev
...
* commit '88b756cd249d1dd4aefb92a73a65fa76cd8ef0d5':
Don't show the touch highlight for double taps
2012-05-17 20:05:49 -07:00
John Reck
88b756cd24
Merge "Don't show the touch highlight for double taps" into jb-dev
2012-05-17 20:03:17 -07:00
John Reck
aa5af8d004
Don't show the touch highlight for double taps
...
Bug: 6490959
Change-Id: I5a6cfa3d36f1df28d9c3b03e120f59581ee22c01
2012-05-17 19:57:08 -07:00
Romain Guy
09528f96f4
am c8c4ced8: Merge "Call invalidate() immediately when a frame is available" into jb-dev
...
* commit 'c8c4ced83872f3eeabd93da34d8376903c42a00b':
Call invalidate() immediately when a frame is available
2012-05-17 19:06:31 -07:00
Romain Guy
c8c4ced838
Merge "Call invalidate() immediately when a frame is available" into jb-dev
2012-05-17 19:04:51 -07:00
Dianne Hackborn
ccf4e2f71b
am abe39277: Merge "Fix issue #6515427 : Add android.hardware.television and fix..." into jb-dev
...
* commit 'abe3927701c0aff839498272565aeee714aa6e9d':
Fix issue #6515427 : Add android.hardware.television and fix...
2012-05-17 18:20:50 -07:00
Dianne Hackborn
abe3927701
Merge "Fix issue #6515427 : Add android.hardware.television and fix..." into jb-dev
2012-05-17 18:18:27 -07:00
Dianne Hackborn
0cf2c8a533
Fix issue #6515427 : Add android.hardware.television and fix...
...
...logic for notouch in Configuration
Added new TELEVISION feature.
We now force the configuration to "television" if the TELEVISION
feature is set, and "notouch" if the TOUCHSCREEN feature is not set.
Also cleaned up documentation, deprecated some configurations that
are not used.
Change-Id: If1c7a284b580a8a66bda2a75f0c7fa841b3dc9b7
2012-05-17 18:11:14 -07:00
Romain Guy
52c145ff5c
Call invalidate() immediately when a frame is available
...
This change ensures that applications producing surface texture updates
at a steady rate will display the updates on screen at the same rate,
v-synced.
Change-Id: I663685b34d12809fbf8945c44851e30a2052ce74
2012-05-17 18:06:23 -07:00
Jake Hamby
cd9f8ea3be
am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev
...
* commit '665935c10ad281721c495621fab7561f2a28842e':
Enable SMS short code patterns to be updated from secure settings.
2012-05-17 17:59:43 -07:00
Jake Hamby
665935c10a
Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev
2012-05-17 17:57:45 -07:00
Matthew Xie
8b4ca7a1a9
Increase the setup-sdp delay to cover for all the devices.
...
20 ms worked well for GN hspa for stress test, but failed sometimes
for other platform. Increased it to 50ms. Tested on all the device types
bug 6438556
Change-Id: Ic5fcde3de7ea6d3d983edab7ae3df5684637bd20
2012-05-17 17:43:00 -07:00
Svetoslav Ganov
65e8ecf37b
am a1daf827: Merge "Fix paragraph iterator." into jb-dev
...
* commit 'a1daf82732c8529bcf9258f42e2cc22be9fa684b':
Fix paragraph iterator.
2012-05-17 17:25:44 -07:00
Svetoslav Ganov
a1daf82732
Merge "Fix paragraph iterator." into jb-dev
2012-05-17 17:23:16 -07:00
Svetoslav Ganov
f1a97a851d
am 044d40ad: am 824aa860: Merge "Accessibility service needs to request permission to be bound to." into jb-dev
...
* commit '044d40ad87f5f6a321aa48f74e05b8355c40f422':
Accessibility service needs to request permission to be bound to.
2012-05-17 17:18:21 -07:00
Adam Powell
3cd72d442b
am f53952a9: am 648337b3: Merge "Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl" into jb-dev
...
* commit 'f53952a9a7aa5ed8af4867b9efcc765c7910b038':
Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl
2012-05-17 17:18:15 -07:00
Carlos Valdivia
43e323a437
am 9a824f07: am 86401950: Merge "Streamline the logic to add account." into jb-dev
...
* commit '9a824f07a3e8ec49948cf6e0f300e1d86f16fea6':
Streamline the logic to add account.
2012-05-17 17:18:11 -07:00
Adam Powell
db03e5fee8
am 8afcf705: am 7fde8e2b: Merge "Be more tolerant in TaskStackBuilder" into jb-dev
...
* commit '8afcf70531298de6f79874e0655431322e441606':
Be more tolerant in TaskStackBuilder
2012-05-17 17:18:08 -07:00
Jeff Brown
148e0b7a1d
am 7ce7fe3b: am 33ebe8c8: Merge "Add systrace method tags for measure and layout." into jb-dev
...
* commit '7ce7fe3b6170c5765a8045a78a272e13f1064d6a':
Add systrace method tags for measure and layout.
2012-05-17 17:18:05 -07:00
Jeff Brown
4c98c36358
am 4fcef3c6: am 6dc23b8e: Merge "Add a label for the new video trace tag." into jb-dev
...
* commit '4fcef3c694852897f61592d72be6c5d27de5cfed':
Add a label for the new video trace tag.
2012-05-17 17:18:02 -07:00