Selim Gurun
86e628df36
am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
...
* commit '79ccb1e8a94eec580eea54db05a7ba246dbf6d92':
Deleting the defunct SearchBox interface.
2012-09-11 15:04:44 -07:00
Selim Gurun
79ccb1e8a9
Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
2012-09-11 15:01:21 -07:00
Jeff Brown
fa4b55c6d5
am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
...
* commit '9ba2a188919e6e5bf8c042b26527fc090de677ef':
Don't auto-discover peers until scan requested.
Use wfdInfo to filter available sinks.
Allow adb shell am display-size to use bigger sizes.
2012-09-11 13:58:35 -07:00
Jeff Brown
9ba2a18891
Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
...
* changes:
Don't auto-discover peers until scan requested.
Use wfdInfo to filter available sinks.
Allow adb shell am display-size to use bigger sizes.
2012-09-11 13:56:04 -07:00
Selim Gurun
a7094734ae
Deleting the defunct SearchBox interface.
...
Change-Id: Iecb698dbe942d3c9680ad1135ba0d604aa211856
2012-09-11 13:27:08 -07:00
Selim Gurun
adb018106c
am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
...
* commit 'faed98a161f58441ebce3dcb08cd8bf76a76da4e':
Added annotations for injected accessibility objects
2012-09-11 13:26:31 -07:00
Selim Gurun
faed98a161
Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
2012-09-11 13:23:45 -07:00
Adam Cohen
48949f9f6d
am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev
...
* commit 'aec914b1301b9608053b77318c8ea86fa162f14d':
Adding notion of keyguard widgets
2012-09-11 13:19:58 -07:00
Adam Cohen
aec914b130
Merge "Adding notion of keyguard widgets" into jb-mr1-dev
2012-09-11 13:18:14 -07:00
Eino-Ville Talvala
cc9c7fa18a
am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
...
* commit 'ff5c9146b53d8429f8ee778f193582c12da0d2b3':
NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
2012-09-11 12:43:48 -07:00
Eino-Ville Talvala
ff5c9146b5
Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
2012-09-11 12:41:11 -07:00
Svetoslav Ganov
8a5623e981
am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
...
* commit 'c574fd04cc192fa30af5dd065c5d0cd4c50f8db4':
Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
2012-09-11 12:18:43 -07:00
Svetoslav Ganov
c574fd04cc
Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
2012-09-11 12:16:13 -07:00
Eino-Ville Talvala
7cfd7d5b65
NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
...
Bug: 7054970
Change-Id: I509fa18f1203022bb23cd9ef5c70cb3a3fbb8b77
2012-09-11 11:34:59 -07:00
Selim Gurun
2eaa82b4da
am 2fa10c67: Fix build break
...
* commit '2fa10c675b42d22e73492154ca0ca1cbdbceaa3a':
Fix build break
2012-09-11 11:34:53 -07:00
Selim Gurun
2fa10c675b
Fix build break
...
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
2012-09-11 11:32:44 -07:00
Eino-Ville Talvala
234e6a5fb1
am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
...
* commit 'a910390b7d64fba46e7c2034f7085b04e5268cab':
Camera: Add SCENE_MODE_HDR.
2012-09-11 11:22:43 -07:00
Eino-Ville Talvala
a910390b7d
Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
2012-09-11 11:20:09 -07:00
Eino-Ville Talvala
b68af8c829
am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
...
* commit '6fc7275d0ede6d352854db8fff95ec611bd07416':
Camera: Add enableShutterSound method.
2012-09-11 11:07:52 -07:00
Eino-Ville Talvala
6fc7275d0e
Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
2012-09-11 11:06:13 -07:00
Selim Gurun
44621b1947
am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev
...
* commit '06ee8cdec509590aeaddcfb30aa517ab369d59c5':
Remove defunct searchbox implementation from webview.
2012-09-11 11:04:06 -07:00
Selim Gurun
06ee8cdec5
Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev
2012-09-11 11:01:32 -07:00
Adam Cohen
0aa2d42e87
Adding notion of keyguard widgets
...
-> Persisting certain appwidget options
-> Adding ability to specify appwidget options on bind
so as to avoid AppWidgetProvider update call with no
options.
Change-Id: I5631039f19f1822b8e123b559b6353c880c0192e
2012-09-11 10:53:57 -07:00
Selim Gurun
0e9292b94a
Remove defunct searchbox implementation from webview.
...
The search box implementation has not been in use since ICS. This
removes dead code from webview.
Change-Id: I8a28eeeec556619abc4a902a3abec2ac52bad319
2012-09-11 10:40:28 -07:00
Selim Gurun
b743a23fc5
Added annotations for injected accessibility objects
...
Bug: 7073422
Provided @JavascriptInterface to methods that are accessible from
js.
Change-Id: If3bf8f5aa2b6ff38fe5358aad534ea31f6f546ae
2012-09-11 10:24:44 -07:00
John Spurlock
aac09a4365
am 9f750af6: Update the dream manager to be multi-user aware.
...
* commit '9f750af6c178d8abb5c12d34efba599e3d53aea4':
Update the dream manager to be multi-user aware.
2012-09-11 08:24:31 -07:00
John Spurlock
9f750af6c1
Update the dream manager to be multi-user aware.
...
Dream settings are stored per-user, so dream manager operations
must act according to the calling or current user.
Bug:7041514
Change-Id: I4a0bbbd76886e6440b1afd89c61af5f4569b0e18
2012-09-11 09:50:23 -04:00
Dianne Hackborn
cf0e649049
am 0bac8bcb: Merge "Animations for user switching." into jb-mr1-dev
...
* commit '0bac8bcbcc281afc041f621a156fd21549d686e1':
Animations for user switching.
2012-09-10 21:06:45 -07:00
Dianne Hackborn
0bac8bcbcc
Merge "Animations for user switching." into jb-mr1-dev
2012-09-10 21:04:55 -07:00
Svetoslav Ganov
ee6c6ae5b2
Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
...
1. The implementation was not taking into account the transformation
matrices if the views.
2. The rectangle that was passed as an argument to
ViewParent.requestChildRectangleOnScreen was modified by
some implementations - now care is taken to prevent it.
3. The scroll of child was used when a rectangle of its coordinate
system was mapped to one in the parent system. However, the
scroll shows how much a parent has scrolled its descendants, so
the scroll of the parent has to be used not the child.
bug:7139556
Change-Id: I5b09eb7f105047e95282f74308968d5465831c84
2012-09-10 20:01:23 -07:00
Dianne Hackborn
9d9ece3c1e
Animations for user switching.
...
The window manager now has a facility to provide a full-screen
animation, which the activity manager uses every time a user
switch happens.
The current animation is just a simple dumb slide until we get
a design from UX.
Also some cleanup: moved the portrait task animations to the
default config so we always have an animation for them, and finally
got the java symbol stuff out of public.xml.
Change-Id: I726f77422b2ef5f2d98f961f8da003e045f0ebe8
2012-09-10 19:58:21 -07:00
Christopher Tate
e8f2334e7e
am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
...
* commit 'e1f02ef080e5046e03b4b3b7bb64e22e7790b707':
Miscellaneous fixes for Settings
2012-09-10 19:23:25 -07:00
Christopher Tate
e1f02ef080
Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
2012-09-10 19:21:53 -07:00
Selim Gurun
f0aa7ea686
am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
...
* commit 'befab9e6b8fcb69cc656bb851ddc7ad7dfa6a7db':
Control access to inherited methods of jsinterface objects
2012-09-10 18:18:47 -07:00
Jeff Brown
43aa159128
Allow adb shell am display-size to use bigger sizes.
...
We now support scaling the logical display to fit the
physical display, whatever size it is. So we can allow
adb shell am display-size to use more or less arbitrary sizes
although we do enforce an upper and lower bound to
protect the user.
Change-Id: I5fe6ba32ad1f9e4fbcd6915f7d36850b987bbcc0
2012-09-10 17:50:18 -07:00
Christopher Tate
d5fe147924
Miscellaneous fixes for Settings
...
(1) It's okay to write literal null as a settings element value
(2) Properly convey the user handle in the put-for-user variant
Bug 7137201
Bug 7139826
Change-Id: I0ed77d65e8377f0e0580a2668f10b7167ad34928
2012-09-10 17:32:39 -07:00
Selim Gurun
94740e6c33
Control access to inherited methods of jsinterface objects
...
Bug: 7073422
Create the plumbing to use an annotation to allow access to
inherited methods of jsinterface objects. The default webview
behavior has not changed yet. However internally an a flag is
introduced to restrict javascript access to methods that have an annotation.
Change-Id: I41927248e6bc4b09d17c0707c60fe5e6ab681e66
2012-09-10 16:43:35 -07:00
John Reck
20f26418f7
am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev
...
* commit 'bdf8fa0c1b762d82b056fa8d929ceaff47ae241b':
Fix some destroy bugs
2012-09-10 16:33:17 -07:00
John Reck
bdf8fa0c1b
Merge "Fix some destroy bugs" into jb-mr1-dev
2012-09-10 16:30:19 -07:00
Katie McCormick
54f6784794
am a25526ae: am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit 'a25526ae400641ae414d2dbf03495f54a0c46d2d':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 16:29:51 -07:00
Katie McCormick
a25526ae40
am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit '51740d6d786bf583cd46d12beb8515aa00d84bee':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 16:27:20 -07:00
Katie McCormick
51740d6d78
am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit '0e9f34bffdfc476122337d077453f722fc22038f':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 16:25:17 -07:00
Katie McCormick
0e9f34bffd
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
Change-Id: I62def95b138282eba4f2e70fd4ab4de35aa03e89
2012-09-10 16:20:20 -07:00
John Reck
095e8aa02b
Fix some destroy bugs
...
Bug: 6961494
Don't call clearHelpers in destroy(). It is already called
in onDetach, which is where it needs to be. It can't be
called by the finalizer
Switch onCancel listener to onDismiss listener. Fixes an issue
where destroying can live the webcore thread hung because onCancel
won't be called, but onDismiss is
Change-Id: I669c389c8c9a81d92c27f88d83bcb711c6c0a5ee
2012-09-10 16:07:04 -07:00
Siva Velusamy
0dffc8d5d0
am bc91c5f8: Merge "Report the user id of every app to ddms." into jb-mr1-dev
...
* commit 'bc91c5f8b175c20f7e63ee245bd70c7e7bba2ba5':
Report the user id of every app to ddms.
2012-09-10 16:02:28 -07:00
Siva Velusamy
bc91c5f8b1
Merge "Report the user id of every app to ddms." into jb-mr1-dev
2012-09-10 15:59:36 -07:00
Dianne Hackborn
68e18e5558
am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev
...
* commit '009ea5a04c38dd209b73d28cb867f05e63ec89cc':
USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
2012-09-10 15:51:26 -07:00
Dianne Hackborn
009ea5a04c
Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev
2012-09-10 15:49:59 -07:00
Dianne Hackborn
a5ba6b33ba
am 4573e29f: Merge "Flesh out multi-user in am commands." into jb-mr1-dev
...
* commit '4573e29faf40983f9d1df99bb0f506d77a868e05':
Flesh out multi-user in am commands.
2012-09-10 15:40:36 -07:00
Dianne Hackborn
4573e29faf
Merge "Flesh out multi-user in am commands." into jb-mr1-dev
2012-09-10 15:39:02 -07:00