Chih-Chung Chang
d4c5b7651f
Merge "Fix a bug that the condition for play/pause was reversed."
2011-02-10 19:23:52 -08:00
Jesse Wilson
c2c9a2492c
Don't add setMaxSize() to the LruCache API. But do add maxSize().
...
Change-Id: I9697ab29491dabe85c2400defdde16b9abcd003a
2011-02-10 19:20:31 -08:00
Adam Cohen
fca67c5525
Adding StackWidget sample code
...
Change-Id: I4c469f25147f733a3a09cdea0db407cd4e9f62ca
2011-02-10 19:12:41 -08:00
James Dong
f9e7442a0c
Update sample code in documentation
...
bug - 3364497
Change-Id: I4cad247a403917aa7816350454c9ae3930dd3d25
2011-02-10 18:48:31 -08:00
Xia Wang
be142fc6aa
Fix test3GToWifiNotification for mobile state validation.
...
Change-Id: I018b28b78907fdd9f3f835faf562b4da5fea8f80
2011-02-10 18:43:45 -08:00
Jesse Wilson
b1d884d589
Merge "Adopt LRU cache in SQLite."
2011-02-10 18:28:44 -08:00
Jesse Wilson
9b5a93550f
Adopt LRU cache in SQLite.
...
Change-Id: I6b43dd8843d41726254bea3a175fe28f5f061ed7
http://b/3184897
2011-02-10 18:26:39 -08:00
Adam Powell
76164d6d45
Merge "Fix bug 2955651 - can open normal menu during action modes"
2011-02-10 18:25:06 -08:00
Amith Yamasani
e3361b8d08
Fix over-eager locking of volume dialog's primary stream.
...
Bug: 3427027
Don't lock in the active stream if visual feedback was not requested.
This fixes a transient problem after the notification volume was modified
by an API call.
Change-Id: I2227d8fdf6cc565713d9bbcc66748805e04ae163
2011-02-10 18:20:50 -08:00
Dheeraj Sharma
fb4e92c4ed
Fix for issue : 3439708 Last frame is missing effect
...
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
2011-02-10 18:05:20 -08:00
Vasu Nori
ba44110117
Merge "bug:3425749 send notification for completed download"
2011-02-10 17:58:36 -08:00
Adam Powell
ef5a440d0a
Fix bug 2955651 - can open normal menu during action modes
...
Prevent the usual menu pipeline from trying to open the action bar
overflow menu when the action bar is not visible.
Change-Id: I0708d142ad271368baa79351b97aad1533636fe7
2011-02-10 17:57:48 -08:00
Vasu Nori
f9e8523e62
bug:3425749 send notification for completed download
...
Change-Id: Ib46df5eaa9316fe0fc843fee1e4597e22768f4a8
2011-02-10 16:54:03 -08:00
Xia Wang
ec841adcf7
Add wait time for Wi-Fi tethering test, bug http://b/issue?id=3436586
...
Change-Id: I6aaac0e6ef7f89d5052c8a5dd2bef71612e72942
2011-02-10 16:28:15 -08:00
Michael Kolb
c4ca53fedf
Add title bar gravity
...
Enable rendering of the embedded title bar
at the top of the page or
at the top of the screen
Change-Id: Ic979b641c8cc80acb83eeab49c4f700fc5c50e72
2011-02-10 15:51:20 -08:00
Romain Guy
eefdd709dd
Merge "Dirty layers in the area covered by a drawBitmapMesh() call Bug #3410827 "
2011-02-10 15:50:16 -08:00
Romain Guy
b18d2d0079
Dirty layers in the area covered by a drawBitmapMesh() call
...
Bug #3410827
Change-Id: Ic8b4f6201af94497bba86c75819588c78debddc2
2011-02-10 15:52:54 -08:00
Jesse Wilson
da350fb685
Merge "Adopt LruCache in WifiStateMachine."
2011-02-10 15:48:17 -08:00
Jason Sams
a03837b6ee
am e8d074d7: am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'e8d074d763f1c9551c41654589597e45476d27e0':
Basic 101 level compute example for RS.
2011-02-10 15:46:21 -08:00
Mathias Agopian
a11faf889e
am c6c3e77d: am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
...
* commit 'c6c3e77d4d5cd8de3b1a56bdffdfd42774849512':
fix [3408713] Dialog window invisible sometimes
2011-02-10 15:46:15 -08:00
Dirk Dougherty
36305fc416
am 592989b3: am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
...
* commit '592989b3b7c088114de6ee59d609449de749fd78':
Doc change: changes for 3.0 SDK
2011-02-10 15:46:10 -08:00
Robert Ly
272fc4547b
am affeaaed: am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
...
* commit 'affeaaed8ef0776455fbecbf70627df3dd842030':
clean up and add javadocs
2011-02-10 15:46:06 -08:00
Alex Sakhartchouk
cc3b7cd293
am bf3aae10: am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'bf3aae10b5fa73cced245276f3b2f433c9cd635e':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:46:01 -08:00
Alex Sakhartchouk
f2270583fd
am 7541a9a2: am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
...
* commit '7541a9a25036410f17718d86fe57ea33c0f789d3':
Cleanup of the code in view to do creation/destruction in the right places.
2011-02-10 15:45:57 -08:00
Glenn Kasten
8132a8caf3
Merge "Bug 3352047 Wrong message when adjusting volume"
2011-02-10 15:27:59 -08:00
Jason Sams
e8d074d763
am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
Basic 101 level compute example for RS.
2011-02-10 15:08:41 -08:00
Mathias Agopian
c6c3e77d4d
am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
...
* commit 'b66b7a2c183a1423ea629d4f73ed95f9b87d54b7':
fix [3408713] Dialog window invisible sometimes
2011-02-10 15:08:33 -08:00
Dirk Dougherty
592989b3b7
am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
...
* commit '12244c57960d85a066c94774e3e37685d0081213':
Doc change: changes for 3.0 SDK
2011-02-10 15:08:28 -08:00
Robert Ly
affeaaed8e
am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
...
* commit 'bbdc4ce254e4918f771e448cd4fa9602679eaf2b':
clean up and add javadocs
2011-02-10 15:08:18 -08:00
Alex Sakhartchouk
bf3aae10b5
am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:08:14 -08:00
Alex Sakhartchouk
7541a9a250
am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
...
* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
Cleanup of the code in view to do creation/destruction in the right places.
2011-02-10 15:07:59 -08:00
Adam Powell
1f0135cb70
Merge "Fix bug 3372468 - ActionBar menu shouldn't be clickable after ActionBar.hide() is called"
2011-02-10 15:07:09 -08:00
Shimeng (Simon) Wang
a22a011fab
Merge "Don't send scroll events in case of new picture from webkit."
2011-02-10 15:07:07 -08:00
Adam Powell
01feaee3d9
Fix bug 3372468 - ActionBar menu shouldn't be clickable after
...
ActionBar.hide() is called
Action bar will capture touch events and prevent focus from passing to
its children while animating out.
Change-Id: I4501f785ead2afa34f020f9bc1a1121932f3c047
2011-02-10 15:05:05 -08:00
Jean-Baptiste Queru
5381b467d5
am fe9b24f4: Ignore a8d3f02a from honeycomb - already there
...
* commit 'fe9b24f4cd665573c2dc0ced444ecc4997ece1a1':
DO NOT MERGE
2011-02-10 15:04:20 -08:00
Huahui Wu
36d2823e57
Merge "b/3416864 Send the cert info from Native to Java side."
2011-02-10 15:00:23 -08:00
Shimeng (Simon) Wang
c566185c70
Don't send scroll events in case of new picture from webkit.
...
When user goes back to a page, the new picture may potentially cause
a scroll event which overrides the history scroll position, since
the scroll position may be bigger than the initial new picture.
Setting the scroll event to be not-user-scrolled will preserve the
history scroll position.
issue: 3433562
Change-Id: Ida176a4bc3a22de0385aed71e11f8b8e0db06f24
2011-02-10 14:50:05 -08:00
Jean-Baptiste Queru
fe9b24f4cd
Ignore a8d3f02a from honeycomb - already there
...
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
2011-02-10 14:49:12 -08:00
Gilles Debunne
cd2e264212
am aff2cfd1: resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
...
* commit 'aff2cfd14b3d37a22b2d6b1ba72b52c6a80a12b3':
Text selection is broken.
2011-02-10 14:48:02 -08:00
Gilles Debunne
aff2cfd14b
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
...
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
2011-02-10 14:43:35 -08:00
Huahui Wu
c56c3e262c
b/3416864 Send the cert info from Native to Java side.
...
Change-Id: Ib4f045f0dd58d85b329eae972c4a4a61ee95f078
2011-02-10 14:40:50 -08:00
Glenn Kasten
8b4b97a14a
Bug 3352047 Wrong message when adjusting volume
...
Add hidden AudioManager.getDevicesForStream and output device codes.
Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
2011-02-10 14:37:42 -08:00
Jesse Wilson
9ebc6b341b
Merge "Document that LruCache is threadsafe."
2011-02-10 14:33:20 -08:00
Vasu Nori
f37c2e2d13
Merge "bug:3443154 fix database tests after disabling sqlite wal"
2011-02-10 14:13:49 -08:00
Eric Laurent
04f7861cfa
Merge "Fix issue 3435692"
2011-02-10 14:01:27 -08:00
Steve Block
6dfef1b86d
Merge "Adds CookieManager methods to configure policy for cookies for file scheme URLs"
2011-02-10 13:59:09 -08:00
Wink Saville
72f0224f2f
am 48fe5c3a: am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '48fe5c3a86435a401fa88b43e15b84e29e660173':
Telephony: Fix cb sms implementation
2011-02-10 13:57:10 -08:00
Mathias Agopian
3013ce4f7c
am b624eea7: am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'b624eea70c18d616a1d0860eb30ae31ac5a33085':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-10 13:57:05 -08:00
Scott Main
6b5e69c7ef
am 0d66a2ec: am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit '0d66a2ec428fe5ae746629b6c62750d1201e3f6f':
add 2.3.3 announcement to site home page
2011-02-10 13:57:02 -08:00
Jeff Hamilton
f6de2431ce
am 9e5ffb55: am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit '9e5ffb55e8eabf8fd9215cbc68538ed5d9efe2d4':
More documentation updates for NFC.
2011-02-10 13:56:56 -08:00