Martijn Coenen
6ea6fa0fd3
am 64f949e3: am 1094b7d7: Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev
...
* commit '64f949e309b70508b2a2b86fd9c891f93263e5c7':
Bluetooth: fix enableNoAutoConnect() call.
2012-08-03 12:17:08 -07:00
Martijn Coenen
1094b7d769
Merge "Bluetooth: fix enableNoAutoConnect() call." into jb-mr1-dev
2012-08-03 12:12:11 -07:00
John Spurlock
7a868afac1
am 50c242fa: am 3185b376: Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev
...
* commit '50c242fa034f8b8f24126084dd8fd14b5ae30536':
Re-enable dreams: frameworks/base
2012-08-03 08:42:37 -07:00
John Spurlock
8d8785c14f
am 93e4e5e9: am 72c30e2c: Merge "Fix typos in android.widget package docs." into jb-mr1-dev
...
* commit '93e4e5e9ba98a3579d8e8874dc691ca95e20d4b3':
Fix typos in android.widget package docs.
2012-08-03 08:38:38 -07:00
John Spurlock
3185b376b0
Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev
2012-08-03 08:36:41 -07:00
Martijn Coenen
10d7e8afb2
Bluetooth: fix enableNoAutoConnect() call.
...
For now, just do a regular connect.
Change-Id: Ibc43098d45c82177298cb17d72a32c7904924021
2012-08-03 08:36:02 -07:00
John Spurlock
72c30e2cec
Merge "Fix typos in android.widget package docs." into jb-mr1-dev
2012-08-03 08:34:43 -07:00
Craig Mautner
b068163406
am af59e0e3: am 7de53949: Merge "Add features to DisplayManager." into jb-mr1-dev
...
* commit 'af59e0e30cac2209654cc9e16deb3cd32279a3d4':
Add features to DisplayManager.
2012-08-03 08:30:23 -07:00
Craig Mautner
7de53949bc
Merge "Add features to DisplayManager." into jb-mr1-dev
2012-08-03 08:25:42 -07:00
John Spurlock
aca7a741cb
Fix typos in android.widget package docs.
...
Fixed spelling errors and cleaned up markup.
Change-Id: I3573087d40bbeb3906a8361abb02de4cb4325a92
2012-08-03 09:14:32 -04:00
John Spurlock
bc632a28e4
Re-enable dreams: frameworks/base
...
Enable feature in config. Expose Dream in public api for unbundled apps.
Unhide package. Add isDreaming() method to service.
Re-arrange the Dream api a bit. (use onStart as hook for subclasses).
Coordinate properly with power manager.
Replace old dock mode (don't fire old intent).
Change-Id: I1318d20cc1613e5d862f2913f2fcdc9719302cf7
Bug: 6921930
2012-08-03 08:51:17 -04:00
Jeff Brown
4bc8e2a345
am 6da0299d: am fbe963f4: Merge "Remove unnecessary code." into jb-mr1-dev
...
* commit '6da0299d02a20b7cefa203f2036fb766247cc2e9':
Remove unnecessary code.
2012-08-02 21:40:31 -07:00
Jeff Brown
fbe963f4ad
Merge "Remove unnecessary code." into jb-mr1-dev
2012-08-02 21:36:33 -07:00
Jeff Brown
5098fd8a0e
Remove unnecessary code.
...
Bug: 6926595
Change-Id: Ice3138675c024e9efe9c7922e1e0a05f19cdde54
2012-08-02 21:34:46 -07:00
Dianne Hackborn
dcf48becce
am 87f83418: am 329465c6: Merge "Add APIs for interacting across users." into jb-mr1-dev
...
* commit '87f83418e823625069ccbd60d4799414eb434eca':
Add APIs for interacting across users.
2012-08-02 19:19:29 -07:00
Dianne Hackborn
329465c6b2
Merge "Add APIs for interacting across users." into jb-mr1-dev
2012-08-02 19:14:39 -07:00
Dianne Hackborn
b4163a6e12
Add APIs for interacting across users.
...
- Expose the existing Context.sendBroadcast() as
Context.sendBroadcastAsUser().
- Add new android:singleUser attribute for services.
- Add new INTERACT_ACROSS_USERS_FULL permission for full
system-level access to cross-user interface (allows
sendBroadcastAsUser() to send to any receiver).
- Add new INTERACT_ACROSS_USERS_FULL permission for
more restricted cross-user interaction: this is required
for android:singleUser, and allows you to use
sendBroadcastAsUser() but only to send to your own
receivers.
Change-Id: I0de88f6718e9505f4de72e3f45d29c0f503b76e9
2012-08-02 19:07:57 -07:00
Adam Powell
e1dcf88c60
am 0cc969a7: am 47892388: Make AutoCompleteTextView#setText(CharSequence, boolean) public
...
* commit '0cc969a7ab86f6e2700c907c8f595baf55d8df9b':
Make AutoCompleteTextView#setText(CharSequence, boolean) public
2012-08-02 18:28:30 -07:00
Adam Powell
478923885d
Make AutoCompleteTextView#setText(CharSequence, boolean) public
...
Bug 6807326
Public bug http://code.google.com/p/android/issues/detail?id=34690
Make this available for use by applications that wish to make
programmatic changes to the AutoCompleteTextView without filtering.
Change-Id: I889452d3b19b378258ad9247f3d254afee1e8408
2012-08-02 17:30:32 -07:00
George Mount
ed85b04ebd
am 8502ab91: am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
...
* commit '8502ab91bdd8ed34eeebed2daac90dea7b3da0ea':
Cancel handler for JS unload handler prevents hang.
2012-08-02 16:33:30 -07:00
George Mount
daceb30bf5
Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
2012-08-02 16:28:03 -07:00
George Mount
df9cae4de3
Cancel handler for JS unload handler prevents hang.
...
Bug 6803309
When the alert dialog raised by the JS unload handler was pressed
outside the alert region, it was canceled and no response was
sent back to WebViewCore. This captures the cancel event so that
WebViewCore doesn't hang.
Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
2012-08-02 15:14:39 -07:00
Craig Mautner
c3edff71bf
am d844e4f2: am 2a642a45: Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev
...
* commit 'd844e4f285348ede6e4f40e71d727e2fe4866c3e':
Refactor DisplayManagerService to be functional.
2012-08-02 15:10:46 -07:00
rich cannings
3cfe6d5cef
am 8c968174: am 9866d60e: Merge "Pass URLs to package verifiers" into jb-mr1-dev
...
* commit '8c96817480863aff8554f95da4f2151b0e9ee5e9':
Pass URLs to package verifiers
2012-08-02 15:10:40 -07:00
Adam Powell
446b54565a
am 0f5a749c: am b1758cf8: Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev
...
* commit '0f5a749c60d489683112fe6cf5220d1a576582ca':
Make MediaRouteButton focusable by default
2012-08-02 15:10:32 -07:00
George Mount
12b7b7fea8
am be38cccd: am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev
...
* commit 'be38cccd91e12576ed994719b6b83371c5749bb9':
Don't restart input in the middle of a batch.
2012-08-02 15:10:28 -07:00
Craig Mautner
7f24ce696a
am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
...
* commit 'ccafb1ad5d60d70baa7f4fbf155e906261e42953':
Introduce multiple displays with DisplayContent.
2012-08-02 15:08:51 -07:00
Craig Mautner
9de4936c99
Add features to DisplayManager.
...
Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.
Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
2012-08-02 14:30:30 -07:00
Craig Mautner
2a642a450a
Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev
2012-08-02 13:16:13 -07:00
rich cannings
9866d60ea4
Merge "Pass URLs to package verifiers" into jb-mr1-dev
2012-08-02 12:57:11 -07:00
Adam Powell
b1758cf8cd
Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev
2012-08-02 11:28:45 -07:00
rich cannings
24713907fe
Pass URLs to package verifiers
...
This change passes the originating URL and accompanied referrer to
package verifiers, when available.
Bug: 6544677
Change-Id: If9ff6663ad7f3426b7aea2aceb1413b689788138
2012-08-02 11:26:47 -07:00
Adam Powell
e468187870
Make MediaRouteButton focusable by default
...
Bug 6921236
Add a default contentDescription for MediaRouteButton.
Add long-press "cheat sheet" support to MediaRouteButtons created by
MediaRouteActionProvider for use in the action bar to match standard
action button behavior.
Change-Id: I313cfcb2349210765b084c3388095de4624009e8
2012-08-02 11:23:55 -07:00
Craig Mautner
4f67ba6ba4
Refactor DisplayManagerService to be functional.
...
Change-Id: Ieac1eca172be5dc5db45302d3afa26188acd4d6d
2012-08-02 11:23:00 -07:00
George Mount
a99dbde643
Don't restart input in the middle of a batch.
...
Bug 6854156
setComposingText is in the middle of a batch and it was resetting
the InputConnection. When the batch ended, it was closing a
batch that wasn't open on the new InputConnection. The reset
turns out not to be necessary anymore -- the LatinIME respects
the content when setComposingText fails to change anything.
Change-Id: If3352b32ed7b3c90c8dcb3d5ff8d308e82849d85
2012-08-02 09:36:06 -07:00
Craig Mautner
437a0fbd57
Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
2012-08-02 09:20:14 -07:00
Craig Mautner
59c009776d
Introduce multiple displays with DisplayContent.
...
Fix a couple of bugs that turned up.
Remove touch/focus from display. Add iterators for access.
Respond to comments. Remove TODOs, and some deviceId parameters.
Change-Id: Idcdb4f1979aa7b14634d450fd0333d6eff26994d
2012-08-02 08:47:44 -07:00
Dianne Hackborn
145d27da15
am 23e6a909: am a7ce1551: Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev
...
* commit '23e6a9098ad464e1c80614b0f2664f29c075b945':
Add API to turn on HW drawing in IMEs.
2012-08-01 19:20:14 -07:00
Dianne Hackborn
a7ce1551a6
Merge "Add API to turn on HW drawing in IMEs." into jb-mr1-dev
2012-08-01 19:05:52 -07:00
Dianne Hackborn
836531b0c4
Add API to turn on HW drawing in IMEs.
...
Change-Id: Ib6a8bda46223ce1153f32834daf02a820d16136e
2012-08-01 19:00:38 -07:00
Chris Wren
bc26dc75c3
am c9d737dd: am 45aaa4a8: am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
...
* commit 'c9d737dd8c5085d1a5717caa03a7d3d907d8afd1':
Add missing docs to notification style rebuilder functions.
2012-08-01 14:56:06 -07:00
Robert Greenwalt
412ebf4624
am d0378f4d: am 6c5cec88: am 6b6ce6bf: am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
...
* commit 'd0378f4dddbff8173c21a263e458ca965cfc4a74':
Telephony: Add HSPAP to getTcpBufferSizesPropName
2012-08-01 14:55:57 -07:00
Jeff Sharkey
231b2814c5
am 2a036091: am 6a916ed0: Merge "Add trimToSize() to public API." into jb-mr1-dev
...
* commit '2a036091420674a56fb2e4634950b9d917d1b7b2':
Add trimToSize() to public API.
2012-08-01 14:53:14 -07:00
Teng-Hui Zhu
cf737484a8
am ca6b44f8: am 3a680382: Merge "Add license info to the HTML5Video files." into jb-mr1-dev
...
* commit 'ca6b44f8a9c78002f1826d49ced350287831dba4':
Add license info to the HTML5Video files.
2012-08-01 14:53:10 -07:00
Dianne Hackborn
7be6374428
am 791039d6: am e6184f83: Merge "Start moving away from DisplayMetrics.DENSITY_DEVICE." into jb-mr1-dev
...
* commit '791039d68ce505057bd2c7a730be85b419f6d024':
Start moving away from DisplayMetrics.DENSITY_DEVICE.
2012-08-01 14:53:06 -07:00
Chris Wren
45aaa4a8f4
am 790474ba: am f11e0e71: Merge "Add missing docs to notification style rebuilder functions." into jb-dev
...
* commit '790474ba3a2fb149090ced7d38247aed6f6a2d59':
Add missing docs to notification style rebuilder functions.
2012-08-01 14:48:56 -07:00
Robert Greenwalt
6c5cec881a
am 6b6ce6bf: am a5637bac: Merge "Telephony: Add HSPAP to getTcpBufferSizesPropName"
...
* commit '6b6ce6bfce56c2f3ce007b33d3f834f8dd62b626':
Telephony: Add HSPAP to getTcpBufferSizesPropName
2012-08-01 14:48:34 -07:00
Jeff Sharkey
6a916ed0c0
Merge "Add trimToSize() to public API." into jb-mr1-dev
2012-08-01 14:34:47 -07:00
Jeff Sharkey
d96b585f5c
Add trimToSize() to public API.
...
Bug: 6602490
Bug: http://code.google.com/p/android/issues/detail?id=35349
Change-Id: Ib3bc7fee05bb0edc375ebee1c40a1d7bd82e2a17
2012-08-01 14:20:04 -07:00
Teng-Hui Zhu
3a68038249
Merge "Add license info to the HTML5Video files." into jb-mr1-dev
2012-08-01 14:19:46 -07:00