Svetoslav Ganov
da04419b64
am f42d34bd: Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API"
...
* commit 'f42d34bdd1934c52e6e588a15cd4c8bd0f66f832':
Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API
2011-10-12 12:38:12 -07:00
Michael Kolb
2fb6245959
am 1eb08f0a: am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0
...
* commit '1eb08f0acb0220d5ad03579c566a00497b665816':
Support spellcheck attribute in WebTextView
2011-10-12 12:37:50 -07:00
Michael Jurka
b701fe81cf
am c15666ad: am 78bbcd31: Merge "Refactoring loading of recent apps" into ics-mr0
...
* commit 'c15666adea2e22096a586bfc4f7c122640ebcacf':
Refactoring loading of recent apps
2011-10-12 12:37:49 -07:00
Adam Powell
d42c029100
am b24f45d5: am 1a4c4334: Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0
...
* commit 'b24f45d542d2838c6f910e4fd57dc5bf738a1ffd':
Fix bug 5396097 - menu theme consistency
2011-10-12 12:37:47 -07:00
Jeff Brown
2b60484225
am 241fe477: am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
...
* commit '241fe477edba539bcc58df4410c307d9540a4233':
Use ashmem for CursorWindows. Bug: 5332296
2011-10-12 12:37:46 -07:00
Svetoslav Ganov
2ac1d424c7
am 5d98d67d: (-s ours) am a72a8063: (-s ours) Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
...
* commit '5d98d67d3198055228587d1f36e0272876f57405':
DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
2011-10-12 12:37:44 -07:00
Svetoslav Ganov
e2aa29b6df
am a8490f1a: (-s ours) am 52f7fcf8: (-s ours) Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
...
* commit 'a8490f1a4d50cd06af5a253e5addce7b2b1172b3':
DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-12 12:37:42 -07:00
Jean-Michel Trivi
1b3fb2fc92
am 21e188fd: Merge "Fix 5389442 RemoteControlClient javadoc"
...
* commit '21e188fd6f264d93746d5c412fa7a210050680e8':
Fix 5389442 RemoteControlClient javadoc
2011-10-12 12:37:37 -07:00
Jeff Sharkey
a2c6f16047
am 69f364ae: Merge "Update internal state when iface is removed."
...
* commit '69f364ae879cfde8716de07cc3358a4bc515a05b':
Update internal state when iface is removed.
2011-10-12 12:37:23 -07:00
Romain Guy
3ef396bb0a
am f751210b: Merge "Fix the build"
...
* commit 'f751210b4b040458df789e217f168bccbb95117a':
Fix the build
2011-10-12 12:37:22 -07:00
Romain Guy
1f66e8bd4e
am df61887f: Merge "Check whether an AsyncTask is created/executed on a looper thread."
...
* commit 'df61887feb5348f1d30a2e86b13ae64c271c4acc':
Check whether an AsyncTask is created/executed on a looper thread.
2011-10-12 12:37:15 -07:00
Romain Guy
fabdc4fba7
am bd3f526e: Merge "Correctly apply transforms when getting a TextureView\'s bitmap Bug #5439406 "
...
* commit 'bd3f526eabcdb77cb2b3ed062072a959924dd95b':
Correctly apply transforms when getting a TextureView's bitmap Bug #5439406
2011-10-12 12:37:13 -07:00
Svetoslav Ganov
f42d34bdd1
Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API"
2011-10-11 16:00:54 -07:00
Michael Kolb
1eb08f0acb
am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0
...
* commit 'f0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d':
Support spellcheck attribute in WebTextView
2011-10-11 15:33:37 -07:00
Michael Jurka
c15666adea
am 78bbcd31: Merge "Refactoring loading of recent apps" into ics-mr0
...
* commit '78bbcd31aac4e6744a00ee0a6bd6ac5cc1bec673':
Refactoring loading of recent apps
2011-10-11 15:33:36 -07:00
Adam Powell
b24f45d542
am 1a4c4334: Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0
...
* commit '1a4c4334f02152c96cfc71136dc31085826c6894':
Fix bug 5396097 - menu theme consistency
2011-10-11 15:33:33 -07:00
Jeff Brown
241fe477ed
am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
...
* commit '58bf986c3e3948242e89654e6d59b97a21345582':
Use ashmem for CursorWindows. Bug: 5332296
2011-10-11 15:33:28 -07:00
Svetoslav Ganov
5d98d67d31
am a72a8063: (-s ours) Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
...
* commit 'a72a80632b07dd7faf0ca2a4a0eae2770b14caa6':
DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
2011-10-11 15:33:26 -07:00
Svetoslav Ganov
a8490f1a4d
am 52f7fcf8: (-s ours) Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
...
* commit '52f7fcf844ffdf5f03bca58e58b1ee3e8cc1a4c5':
DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-11 15:33:25 -07:00
Michael Kolb
f0f7a9139b
Merge "Support spellcheck attribute in WebTextView" into ics-mr0
2011-10-11 15:25:22 -07:00
Jean-Michel Trivi
21e188fd6f
Merge "Fix 5389442 RemoteControlClient javadoc"
2011-10-11 15:24:15 -07:00
Michael Jurka
78bbcd31aa
Merge "Refactoring loading of recent apps" into ics-mr0
2011-10-11 15:23:08 -07:00
Adam Powell
1a4c4334f0
Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0
2011-10-11 15:07:36 -07:00
Michael Jurka
ab48b68140
Refactoring loading of recent apps
...
- fix bugs 5278690 and 5432097
- no longer forcing a reload when screen is rotated
- moving recents loading code into a seaprate class
- changing variable names to use "Task" rather than "Activity" in Recent Apps
Change-Id: Ib0c8c5d537cf9d46d65b2ccb790015b601bb1bf1
2011-10-11 15:02:48 -07:00
Jeff Sharkey
69f364ae87
Merge "Update internal state when iface is removed."
2011-10-11 14:54:08 -07:00
Romain Guy
f751210b4b
Merge "Fix the build"
2011-10-11 14:51:18 -07:00
Romain Guy
4db2504ada
Fix the build
...
Change-Id: I3071feab62abee7393557ceb920786b476fb0b02
2011-10-11 14:48:56 -07:00
Michael Kolb
64b4f16adf
Support spellcheck attribute in WebTextView
...
Bug: 5267547
set no suggestions for WebTextView when spellcheck attribute is
false
depends on CL: https://android-git.corp.google.com/g/#/c/141326/2
Change-Id: I4ad476270607e9d600567bbb4d9fd321893707b1
2011-10-11 14:19:53 -07:00
Svetoslav Ganov
8b6c7dd2fe
Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API
...
The methods were hidden for the previoud release since they were added
too close to the SDK final date.
bug:5424373
Change-Id: I812b9809223db75636b04549500f023820b6eb5a
2011-10-11 14:16:41 -07:00
Romain Guy
df61887feb
Merge "Check whether an AsyncTask is created/executed on a looper thread."
2011-10-11 14:10:10 -07:00
Romain Guy
7498ccb6b9
Check whether an AsyncTask is created/executed on a looper thread.
...
Change-Id: I181b253c50a6579f35e61cd4b0c500379462e035
2011-10-11 14:09:27 -07:00
Jean-Michel Trivi
ad87f5b40f
Fix 5389442 RemoteControlClient javadoc
...
Extend RemoteControlClient class description with an example
of instance creation showing how the PendingIntent is created
and how it uses the same ComponentName as the one used
in AudioManager.registerMediaButtonEventReceiver()
Change-Id: If8f050f94b112f9680ba6bf32ba622bc648fb1d0
2011-10-11 14:09:23 -07:00
Romain Guy
bd3f526eab
Merge "Correctly apply transforms when getting a TextureView's bitmap Bug #5439406 "
2011-10-11 14:07:15 -07:00
Romain Guy
a9dc86b21d
Correctly apply transforms when getting a TextureView's bitmap
...
Bug #5439406
Change-Id: I271a9a2e38f5b3600dc158f8f442a6b0893f472b
2011-10-11 14:06:21 -07:00
Jeff Brown
58bf986c3e
Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
2011-10-11 13:54:45 -07:00
Svetoslav Ganov
a72a80632b
Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
2011-10-11 13:54:28 -07:00
Svetoslav Ganov
52f7fcf844
Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
2011-10-11 13:54:23 -07:00
John Reck
952f8a8792
am baf87116: Merge branch \'master\' of ssh://android-git:29418/platform/frameworks/base
...
* commit 'baf8711684885fdc242c44903200ca6904fa5c46':
2011-10-11 13:52:17 -07:00
Scott Main
bec41d9ab5
am c351ab47: cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5 docs: add docs for new hardware feature constants
...
* commit 'c351ab473400ff15e53c33ab57cf8286c4bfad7a':
cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5 docs: add docs for new hardware feature constants
2011-10-11 13:52:14 -07:00
John Reck
baf8711684
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-10-11 13:49:59 -07:00
Adam Powell
538e565c06
Fix bug 5396097 - menu theme consistency
...
Fix a bug where action bar menus were using the wrong context to
inflate stock views. This was causing them to use the action bar's
themed widget context instead of the current theme's specific action
bar items.
Note that action views in the menu will still be inflated using the
themed widget context. This can produce some weird side effects if
the action views use theme attributes relating to these action bar
item attributes.
Change-Id: Ied3614d1fedb10a0f5366bbe7b90cd5f2f1ff969
2011-10-11 13:49:28 -07:00
Nick Pelly
5eba4d6713
am 79425fd6: Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API\'s."
...
* commit '79425fd600e521f1eb4947c26ef631d3e1d29920':
Remove deprecated (and hidden) enableForegroundNdefPush callback API's.
2011-10-11 12:41:32 -07:00
Nick Pelly
79425fd600
Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's."
2011-10-11 12:39:46 -07:00
Jeff Brown
24285a1ad3
am e69eaf5c: Merge "Don\'t log BlockGuard violations on ENG builds."
...
* commit 'e69eaf5c6de95a0db7d5cddf079169a925bac85f':
Don't log BlockGuard violations on ENG builds.
2011-10-11 12:36:25 -07:00
Jeff Brown
e69eaf5c6d
Merge "Don't log BlockGuard violations on ENG builds."
2011-10-11 12:35:05 -07:00
Scott Main
c351ab4734
cherrypick from hc-mr2 Change-Id: Ia38b7c364a3a655faa5cc5d13e19c2dbbb12eee5
...
docs: add docs for new hardware feature constants
Change-Id: I1b5b7b37a85856d28db8ecf08b070f24312ccca2
2011-10-11 12:03:10 -07:00
Daniel Sandler
fe1d0ace8d
am b545851d: Merge "Stop enabling all disabled status bar features from GlobalActions."
...
* commit 'b545851dd59766f5e9471a08fdd7b60318492eb9':
Stop enabling all disabled status bar features from GlobalActions.
2011-10-11 12:02:40 -07:00
Daniel Sandler
b545851dd5
Merge "Stop enabling all disabled status bar features from GlobalActions."
2011-10-11 12:01:15 -07:00
Svetoslav Ganov
eb0c52e491
DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
...
Cherry picking since branching caught us in the middle of review.
bug:5439637
Change-Id: I67d080abb4c14cad88b952e2f91d65e181b2029b
2011-10-11 11:58:13 -07:00
Jeff Sharkey
89b8a2161a
Update internal state when iface is removed.
...
Bug: 5433432
Change-Id: I7eb0ffe3ae07f42d5c47fe4082f490478c5099bf
2011-10-11 11:58:11 -07:00