4040 Commits

Author SHA1 Message Date
Jeff Brown
2c89d171fa am fc959a38: am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
* commit 'fc959a389564f2ffef9c4ceba0b1ff119dd53933':
  Add new ASSIST key and map it to the global assist intent.
2012-06-14 11:40:10 -07:00
Jeff Brown
fc959a3895 am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
* commit '9e197141f8249e36d3f19aeda332ae40dac7da05':
  Add new ASSIST key and map it to the global assist intent.
2012-06-14 11:33:31 -07:00
Jeff Brown
9e197141f8 Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev 2012-06-14 11:28:52 -07:00
Adam Powell
cf815b56bf am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
* commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1':
  MediaRouter dialog
2012-06-14 10:32:49 -07:00
Jeff Brown
de7a8ead24 Add new ASSIST key and map it to the global assist intent.
Moved some duplicate code from SearchPanelView and LockScreen
over to SearchManager to avoid creating yet another copy of it
in PhoneWindowManager.

Bug: 6594275
Change-Id: Ib4ebcd6817639d17548952ab2ce7cb876c05777c
2012-06-14 04:16:26 -07:00
Winson Chung
7fbd28438c Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)
Change-Id: I76d688b10ee7775b4ebe81259713f2aaf0009d05
2012-06-13 15:29:19 -07:00
Adam Powell
6c14359074 am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
  MediaRouter dialog
2012-06-13 14:05:24 -07:00
Adam Powell
70e11e50ee MediaRouter dialog
Add the dialog behavior for MediaRouteActionProvider/MediaRouteButton.

Still TODO:

* Switch audio icon based on source; speaker/bt/user

* Rig up volume slider

* Rig up item icons

* Rig up group button for groupable categories

* Make grouping work

Change-Id: I3f992516b184d5ae940ddb7bbb7f94ff58914589
2012-06-13 11:42:10 -07:00
Adam Powell
49a0b01bdc am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
  MediaRouter work
2012-06-12 13:01:30 -07:00
Adam Powell
0c9c063179 am a20d99b1: am ae20ae1a: More MediaRouter features.
* commit 'a20d99b17906cb371203be8ec4dc92d9a104f8dd':
  More MediaRouter features.
2012-06-12 13:01:03 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
2012-06-12 13:00:47 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
2012-06-12 13:00:33 -07:00
Adam Powell
0d637d6f88 am 579ec308: Merge "MediaRouter work" into jb-dev
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work
2012-06-12 12:46:02 -07:00
Adam Powell
a20d99b179 am ae20ae1a: More MediaRouter features.
* commit 'ae20ae1a8aaa013813c356ae1d9541ca7ff020ae':
  More MediaRouter features.
2012-06-12 12:43:48 -07:00
Dianne Hackborn
007f2b40f9 am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
  Rework media router to be per-context with global process state.
2012-06-12 12:43:20 -07:00
Adam Powell
bee681a1d5 am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter
2012-06-12 12:42:48 -07:00
Adam Powell
b35c445f34 MediaRouter work
Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
2012-06-12 11:26:39 -07:00
Adam Powell
ae20ae1a8a More MediaRouter features.
Add RemoteControlClient to user routes. This will allow the UI layered
on top to access info about the remote volume channel associated with
a user route.

Add icons for user routes and route groups.

Change-Id: I438aa60fc8c93f878ec7638897225738155f0746
2012-06-11 19:28:48 -07:00
Wink Saville
702182d340 am e0f8b91e: am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
* commit 'e0f8b91e049b51770329c43e38aa88ccbb957104':
  Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:41:16 -07:00
Wink Saville
e0f8b91e04 am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
  Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:36:46 -07:00
Dianne Hackborn
b58b8f832d Rework media router to be per-context with global process state.
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
2012-06-11 15:41:08 -07:00
Adam Powell
d0d2cda9d4 Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
2012-06-11 13:17:44 -07:00
rich cannings
368ed010ee Add Intent extras to pass to package verifiers
Adding extras to identify the:

 - URL from which the APK originated

 - the HTTP referrer associate with the URL

Bug: 6544677
Change-Id: Ie3d2244d9befa7161eeceb458573d6b0f8206cc7
2012-06-07 16:11:25 -07:00
Dianne Hackborn
b51e5bd666 am ecc42f8b: am 4ca17df3: Fix build.
* commit 'ecc42f8bdcd7279c6804bda3b4feeaea51019d48':
  Fix build.
2012-06-06 15:15:24 -07:00
Dianne Hackborn
4ca17df380 Fix build.
Change-Id: I42c3f6466d926258bbd303f2082de7207734451a
2012-06-06 15:02:25 -07:00
Dianne Hackborn
20e14948f2 am 82811d45: am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
* commit '82811d45ed21ccdff77d11495fa2045c7942bd6d':
  Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:37:57 -07:00
Dianne Hackborn
533fce25a2 Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev 2012-06-06 13:31:59 -07:00
Dianne Hackborn
636fd528f7 Docs (mostly): enumerate JELLY_BEAN target SDK changes.
Okay this isn't entirely docs.  I have un-hidden the new permission
for binding to accessibility services; we were going to go out with
it hidden since it didn't go into factory ROM, but now that we are
doing other things we might as well expose it.

Also changed a log from E to W, since it is not an error.

Change-Id: I9226c95e3b63e12218fe41dc3f4290d9824a9e5c
2012-06-06 11:36:49 -07:00
Adam Powell
b85afc25d5 resolved conflicts for merge of 1178569b to master
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
2012-06-05 20:08:41 -07:00
Adam Powell
690ffb4e1f More fun with MediaRouter
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
2012-06-05 19:15:57 -07:00
Fabrice Di Meglio
0cd655ad2d Merge "Revert "Revert "Clean up layout direction APIs for Drawable""" 2012-06-04 16:29:05 -07:00
Fabrice Di Meglio
c8e46199de Make 16.txt identical to the one from Jellybean
Change-Id: I46f48022e27b0a6339efcee73f50014adfeaf924
2012-06-04 15:23:32 -07:00
Fabrice Di Meglio
b03b434089 Revert "Revert "Clean up layout direction APIs for Drawable""
This reverts commit c96132ff53e5c26f5b0170edd85072006fb2bc70
2012-06-04 12:55:30 -07:00
Dianne Hackborn
87553a4743 am 524d8ee8: am 433927c5: Fix build.
* commit '524d8ee8e0fd8d8be8273a5b59886371d6fa77b8':
  Fix build.
2012-06-04 12:40:48 -07:00
Dianne Hackborn
433927c52f Fix build.
Change-Id: Iccffe6dde6b96eaab4800e0bb0a9d46f740d686a
2012-06-04 12:14:21 -07:00
Daniel Sandler
a9a6ef6aee am e3e7b65d: am f756e495: Fix build break.
* commit 'e3e7b65dfd3834263e03312e515f522254b9f799':
  Fix build break.
2012-06-04 12:01:26 -07:00
Daniel Sandler
f756e495d5 Fix build break.
Change-Id: I3ce946740e0de0850f17c05b6701a7b070bfe8c9
2012-06-04 14:36:25 -04:00
Adam Powell
a55a94bfb3 am 58e29c06: am 7c86958d: Merge "Add MediaRouter API." into jb-dev
* commit '58e29c06610054419339bb0a75c44ab30d6fe89a':
  Add MediaRouter API.
2012-06-03 14:19:07 -07:00
Adrian Ludwig
8100eaa59d am d966c19c: am 4bc97b54: Fix build.
* commit 'd966c19c090d696363daac73c3cb092340f7c8c9':
  Fix build.
2012-06-02 08:21:12 -07:00
Dianne Hackborn
cbc5e0aae4 am 3522225d: am ea01e4a2: Merge "Survey says: NIET!" into jb-dev
* commit '3522225dba19e77defaf56f0e70c0382c2cbb0a2':
  Survey says: NIET!
2012-06-02 08:20:36 -07:00
Jean-Baptiste Queru
c96132ff53 Revert "Clean up layout direction APIs for Drawable"
This reverts commit c1da65187a4b9de8f72bd617ef937030187c0a92.
2012-06-02 05:46:20 -07:00
Adam Powell
9a1de308ce Add MediaRouter API.
This is just the initial state tracking. Still to go is
actually triggering Bluetooth A2DP correctly and tracking
process state in the system server.

Change-Id: I33031d52799d6e2d7208910da833831085cc3677
2012-06-01 18:19:20 -07:00
Adrian Ludwig
4bc97b54f4 Fix build.
Change-Id: I739102258739ceb9856b8867949fa7f53532189d
2012-06-01 16:03:04 -07:00
Dianne Hackborn
4034bc431d Survey says: NIET!
Bug: 6593206
Change-Id: I5390609a5615d6aff1793a9bc361012a0cea330b
2012-06-01 13:38:48 -07:00
Fabrice Di Meglio
7806882541 Merge "Clean up layout direction APIs for Drawable" 2012-06-01 11:41:58 -07:00
Fabrice Di Meglio
c1da65187a Clean up layout direction APIs for Drawable
- see bug #6427629

Change-Id: I3119db3022bba0ee325b6d0d4471bfebd850ec10
2012-06-01 11:39:10 -07:00
Philip Milne
0597161ee4 Merge "Fix for bug 6050753." 2012-05-31 10:30:09 -07:00
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
2012-05-28 14:20:07 +01:00
Jean-Michel Trivi
3266873f7f am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit 'b3db8dc9f1c164dedd7282f8d6e392641e4e8cc9':
  Unhide KeyguardManager locked and secure state getters
2012-05-24 18:34:07 -07:00
Jean-Michel Trivi
37fde0aca0 Unhide KeyguardManager locked and secure state getters
Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
2012-05-24 18:09:44 -07:00