Svetoslav Ganov
1c0bdd9176
am 43e3366b: am b1ae25cb: Merge "ActivityChooserModel does not handle package changes on the thread that created it." into jb-dev
...
* commit '43e3366b55bd71842c22ba8d974c1e7e630fcecd':
ActivityChooserModel does not handle package changes on the thread that created it.
2012-05-09 10:08:07 -07:00
Svetoslav Ganov
4833ca2903
am 755b2146: am b2ee0d57: Merge "Text traversal at various granularities." into jb-dev
...
* commit '755b2146735c15deb0eb611430a7da1e363d82a1':
Text traversal at various granularities.
2012-05-09 10:08:03 -07:00
Gilles Debunne
b2b36eaf8d
am 733980bd: am f4c77df0: Merge "Fixed PIN display, including in Arabic." into jb-dev
...
* commit '733980bd8c615774bb1d0d12f4b23b8c753a7bdc':
Fixed PIN display, including in Arabic.
2012-05-09 10:08:00 -07:00
Romain Guy
b166539a47
am 0064c032: am e79e8758: Merge "Remove ViewTreeObserver allocations" into jb-dev
...
* commit '0064c032f4a890970c285567520c057976909ea9':
Remove ViewTreeObserver allocations
2012-05-09 10:07:52 -07:00
John Wang
5e6e56cec8
am 00534e06: am 15feb688: Merge "Set provider name in airplane mode." into jb-dev
...
* commit '00534e06faf9e5645dc971e3bd0ee1d9eb616dda':
Set provider name in airplane mode.
2012-05-09 10:07:49 -07:00
Adam Powell
c1e8244f72
am c5967ab8: am e601efd3: Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev
...
* commit 'c5967ab8defdb199b95317a3c67957f8d7a0aacb':
Fix a bug in Activity Up navigation dispatching
2012-05-09 10:07:46 -07:00
Jeff Brown
012c9ed9ce
am 1f455691: am 2fd54c41: Merge "Improve animation timing." into jb-dev
...
* commit '1f455691fe344e9dd44b092036f0dc8b8b00cce1':
Improve animation timing.
2012-05-09 10:07:43 -07:00
Adam Powell
8ca0ca9ad5
am 06aedd01: am 6392a360: Merge "Fix misc. bugs in AbsListView smooth scrolling." into jb-dev
...
* commit '06aedd01c146fdbe59efb0923d8049a37df9968b':
Fix misc. bugs in AbsListView smooth scrolling.
2012-05-09 10:07:40 -07:00
Colin Cross
521608e3a1
am aa3ff6b6: am 401d93f0: Merge "Use libsuspend to trigger suspend" into jb-dev
...
* commit 'aa3ff6b668d07abeec5d57cd47824a360409f5a0':
Use libsuspend to trigger suspend
2012-05-09 10:07:35 -07:00
Svetoslav Ganov
43e3366b55
am b1ae25cb: Merge "ActivityChooserModel does not handle package changes on the thread that created it." into jb-dev
...
* commit 'b1ae25cb37e92a30d196290b75a159e5382c5b34':
ActivityChooserModel does not handle package changes on the thread that created it.
2012-05-09 01:45:31 -07:00
Svetoslav Ganov
755b214673
am b2ee0d57: Merge "Text traversal at various granularities." into jb-dev
...
* commit 'b2ee0d57672faf42ca88fa878dc7e688046c915e':
Text traversal at various granularities.
2012-05-09 01:45:24 -07:00
Gilles Debunne
733980bd8c
am f4c77df0: Merge "Fixed PIN display, including in Arabic." into jb-dev
...
* commit 'f4c77df0593c1bb81dd5ee04ee415a8cf3bd37bb':
Fixed PIN display, including in Arabic.
2012-05-09 01:45:20 -07:00
Romain Guy
0064c032f4
am e79e8758: Merge "Remove ViewTreeObserver allocations" into jb-dev
...
* commit 'e79e87581280f4f3b26b1d4496b34cbb9aa39ae5':
Remove ViewTreeObserver allocations
2012-05-09 01:45:18 -07:00
John Wang
00534e06fa
am 15feb688: Merge "Set provider name in airplane mode." into jb-dev
...
* commit '15feb6883442001dd9b609264ceed7e494a7b92a':
Set provider name in airplane mode.
2012-05-09 01:45:15 -07:00
Adam Powell
c5967ab8de
am e601efd3: Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev
...
* commit 'e601efd375e79ae016593617f08d6a09a536f719':
Fix a bug in Activity Up navigation dispatching
2012-05-09 01:45:12 -07:00
Jeff Brown
1f455691fe
am 2fd54c41: Merge "Improve animation timing." into jb-dev
...
* commit '2fd54c416b6f648e93bfa9dcb34fe8c6e4847a0f':
Improve animation timing.
2012-05-09 01:44:57 -07:00
Adam Powell
06aedd01c1
am 6392a360: Merge "Fix misc. bugs in AbsListView smooth scrolling." into jb-dev
...
* commit '6392a3609cb6457aec715804e15b51fa498141c6':
Fix misc. bugs in AbsListView smooth scrolling.
2012-05-09 01:44:55 -07:00
Colin Cross
aa3ff6b668
am 401d93f0: Merge "Use libsuspend to trigger suspend" into jb-dev
...
* commit '401d93f0dbc21673316ebccae2fdaaf84f5169cd':
Use libsuspend to trigger suspend
2012-05-09 01:44:47 -07:00
Xavier Ducrohet
05b50149ab
Fix classpath of eclipse projects for layoutlib.
...
This is due to the prebuilts reorg.
Change-Id: I6afa82d7ac64286aa89b4b1cfb4af59e4c7000ce
2012-05-08 16:18:32 -07:00
Dianne Hackborn
709d138d2f
am eef61216: am 8e11051a: Merge "Tweak anim API to automatically call Intent.setSourceBounds()." into jb-dev
...
* commit 'eef61216183b77842d06533fcc661020c0032d2d':
Tweak anim API to automatically call Intent.setSourceBounds().
2012-05-08 15:02:13 -07:00
Glenn Kasten
1f3899d418
am cceaf8d8: am ebd6016b: Merge "Add audio tag to systrace" into jb-dev
...
* commit 'cceaf8d80d29879c3ce045b8bed92181aaee9d8e':
Add audio tag to systrace
2012-05-08 15:01:46 -07:00
Dianne Hackborn
2a8650bdca
am 009e6e6b: am bae365c1: Merge "Fix issue #6319312 : Consecutive call to Activity\'s onCreate()/onResume()..." into jb-dev
...
* commit '009e6e6b5e83f18cd691d69dc5f08e04bfccf059':
Fix issue #6319312 : Consecutive call to Activity's onCreate()/onResume()...
2012-05-08 15:01:27 -07:00
Fabrice Di Meglio
be17aaae33
am 20dafa47: am d9aab543: Merge "Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions" into jb-dev
...
* commit '20dafa47b62d1125575cd75b60eb2b17d43c0f06':
Fix bug #6318791 Replace the Lohit Devanagari and Tamil with Droid versions
2012-05-08 11:33:49 -07:00
Victoria Lease
eb214f2fb5
am 6f88f764: am 7ca37df0: Merge "Add Droid Devanagari/Tamil fonts." into jb-dev
...
* commit '6f88f7647d798bc4fff3988d6327df2ee7476573':
Add Droid Devanagari/Tamil fonts.
2012-05-08 11:33:45 -07:00
Jim Miller
6dfe7d937f
am 07e1f123: am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev
...
* commit '07e1f12350819cc8fa93dbfe9e8655594b859e64':
Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
2012-05-08 11:33:38 -07:00
Matthew Xie
88dcbda03b
am 87d7c1d7: am ac8a61b6: Merge "When turning off, broadcast STATE_OFF in the last HotOff state" into jb-dev
...
* commit '87d7c1d740c93147a762595fd7e415dbebfb182f':
When turning off, broadcast STATE_OFF in the last HotOff state
2012-05-08 11:33:35 -07:00
Jim Miller
56f895a2fc
am 8676726d: am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev
...
* commit '8676726dcfa54e4fecb0c0676d9945ad49f079c5':
Fix 6397736: Swipe up to search layout fixes
2012-05-08 11:33:22 -07:00
Jeff Sharkey
54cb5592b6
am 83abfb3c: am 476b03b0: Merge "Handle silent ringtone, title without permission." into jb-dev
...
* commit '83abfb3cab53314fd5a7601e427b4b8b714f6f06':
Handle silent ringtone, title without permission.
2012-05-08 11:32:45 -07:00
Robert Greenwalt
1fee5ef1aa
am d760beb7: am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev
...
* commit 'd760beb735538d61d78584722352a888629b670a':
Bring up the ethernet interface when detected
2012-05-08 11:32:41 -07:00
Eric Fischer
7216d98e8f
am 3b08f16d: (-s ours) am 7833e5f5: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '3b08f16da271fb0107c6cb844e4acbcd75d8a9b1':
Import translations. DO NOT MERGE
2012-05-08 11:32:36 -07:00
Eric Fischer
019fab41f7
am 26c2c601: (-s ours) am 0253c059: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '26c2c6010b9ef1b834b218e49a9641c5d88f9de9':
Import translations. DO NOT MERGE
2012-05-08 11:32:30 -07:00
Chet Haase
92fe0fabf3
am 48fa4717: am 4bbcae7e: Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev
...
* commit '48fa47174268a7e94e3e39fdd02785d97be3d446':
Fix issue where scale-animating text would jump temporarily a few pixels
2012-05-08 11:32:25 -07:00
Craig Mautner
f3a7cb3cac
am 22135e46: am d8efe424: Merge "Change DimAnimator to reflect rotations." into jb-dev
...
* commit '22135e46b167ed45337ba41bd306d93e5fa67841':
Change DimAnimator to reflect rotations.
2012-05-08 11:32:15 -07:00
Marco Nelissen
630f6243da
am 7bd44d97: am b3482ffb: Merge "Fix crash when decoding bitmap" into jb-dev
...
* commit '7bd44d97f7026d3d4e8d2c2e1d14d96bf936f2a6':
Fix crash when decoding bitmap
2012-05-08 11:32:09 -07:00
Philip Milne
3ed259a43c
am 2a52d26c: am 7bb66c9c: Hide optical bounds feature for JB.
...
* commit '2a52d26c0b917de8b1e4d20ebad87b9b3825f6ca':
Hide optical bounds feature for JB.
2012-05-08 11:32:06 -07:00
Amith Yamasani
988b832b34
am 503b2e5a: am 44e3f88f: Merge "Javadoc improvements in SearchView per API review." into jb-dev
...
* commit '503b2e5ae1b83e5595b47a8d376db6b89b059b87':
Javadoc improvements in SearchView per API review.
2012-05-08 11:29:57 -07:00
John Reck
2eeec7189e
am 462ee95f: am a09b06ef: Merge "Remove heldMotionless disabling native scroll mode" into jb-dev
...
* commit '462ee95ff0cfb01d295c0b7e34bf995a50edb313':
Remove heldMotionless disabling native scroll mode
2012-05-08 11:29:54 -07:00
Gilles Debunne
bb5971a78f
am 8779c022: am 0caf421e: Merge "Final fix in SpannableStringBuilder." into jb-dev
...
* commit '8779c022b401b2a269e058c2c27b885694b696f3':
Final fix in SpannableStringBuilder.
2012-05-08 11:29:49 -07:00
Jeff Sharkey
34ea7d84ec
am e4b703b7: am fb0caad4: Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev
...
* commit 'e4b703b7ea15ec9af2caec65a62ba6091bb61f0c':
Ack, wrap advisePersistThreshold() in lock.
2012-05-08 11:29:41 -07:00
Svetoslav Ganov
b1ae25cb37
Merge "ActivityChooserModel does not handle package changes on the thread that created it." into jb-dev
2012-05-07 18:23:44 -07:00
Svetoslav Ganov
b2ee0d5767
Merge "Text traversal at various granularities." into jb-dev
2012-05-07 17:54:31 -07:00
Gilles Debunne
f4c77df059
Merge "Fixed PIN display, including in Arabic." into jb-dev
2012-05-07 17:45:47 -07:00
Romain Guy
e79e875812
Merge "Remove ViewTreeObserver allocations" into jb-dev
2012-05-07 17:45:33 -07:00
John Wang
15feb68834
Merge "Set provider name in airplane mode." into jb-dev
2012-05-07 17:43:40 -07:00
Adam Powell
e601efd375
Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev
2012-05-07 17:40:09 -07:00
Adam Powell
07304f5299
Fix a bug in Activity Up navigation dispatching
...
Propagate the return value from onNavigateUp as the result of
onMenuItemSelected. This fixes a bug where the action bar Up nav
button clicks would not be propagated to support lib FragmentActivity
or other activity subclasses that rely on processing otherwise
unhandled onMenuItemSelected events.
Change-Id: Id879dd1756ed06b8a7b720ebf0eae2a8ddc66ca8
2012-05-07 17:32:44 -07:00
Svetoslav Ganov
6d17a936f7
Text traversal at various granularities.
...
1. Implementing text content navigation at various granularities.
For views that have content description but no text the
content description is the traversed at character and word
granularities. For views that inherit from TextView the
supported granularities are character, word, line, and page.
bug:5932640
Conflicts:
core/java/android/view/View.java
Conflicts:
core/java/android/view/View.java
Change-Id: I66d1e16ce9ac5d6b49f036b17c087b2a7075e4c0
2012-05-07 17:31:52 -07:00
Jeff Brown
2fd54c416b
Merge "Improve animation timing." into jb-dev
2012-05-07 17:12:27 -07:00
Adam Powell
6392a3609c
Merge "Fix misc. bugs in AbsListView smooth scrolling." into jb-dev
2012-05-07 17:10:42 -07:00
Colin Cross
401d93f0db
Merge "Use libsuspend to trigger suspend" into jb-dev
2012-05-07 16:55:49 -07:00