Christopher Tate
a25bbca8cc
am ae25805d: am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
...
* commit 'ae25805d2063d81d3e8ae786b0d972b666c5cf18':
Set up default (random) Android IDs for all users
2012-09-12 15:34:18 -07:00
Robert Greenwalt
dd912320ff
am f02e72d9: am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit 'f02e72d99f5d1fc05ea31676d13e7fd1e8b65c1f':
EthernetDataTracker: indicate link up based on flags
2012-09-12 15:34:09 -07:00
Selim Gurun
c5c68d9789
am 77f02ca9: am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
...
* commit '77f02ca908e114df2e14a7671824f3374a509280':
Deleting the defunct SearchBox interface.
2012-09-12 15:28:53 -07:00
Jeff Brown
984f157366
am 2eb82513: am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
...
* commit '2eb82513bd448757250dc8245e9c29c747397608':
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-12 15:28:20 -07:00
Selim Gurun
2137aa2afc
am cccad2d8: am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
...
* commit 'cccad2d8c2ea309a73b9408f8c36e7d964627570':
Added annotations for injected accessibility objects
2012-09-12 15:15:04 -07:00
Adam Cohen
3f3a60a037
am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev
...
* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
Adding notion of keyguard widgets
2012-09-12 15:14:57 -07:00
Eino-Ville Talvala
21616b27ff
am 64791aab: am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
...
* commit '64791aabd4f16df4adf5ec6adf97aa2b0633dd6c':
NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
2012-09-12 15:14:35 -07:00
Svetoslav Ganov
bb4a9840a5
am 7abd5cfa: am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
...
* commit '7abd5cfacf3be80f79d4a01f1a60b4b7bfb411f6':
Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
2012-09-12 15:14:21 -07:00
Selim Gurun
41ecd35fd9
am 3591fa3b: am 2fa10c67: Fix build break
...
* commit '3591fa3bcd6c5204c6b0d470a186535b65b14042':
Fix build break
2012-09-12 15:14:09 -07:00
Eino-Ville Talvala
ef492d3da3
am 94aa95be: am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
...
* commit '94aa95beca8482bb8f5cf9f9bd0c26b9738d2f51':
Camera: Add SCENE_MODE_HDR.
2012-09-12 15:14:05 -07:00
Eino-Ville Talvala
e8eb5951b2
am 9725ff46: am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
...
* commit '9725ff46c445f9d259bdee18ed86072a937ba117':
Camera: Add enableShutterSound method.
2012-09-12 15:13:46 -07:00
Selim Gurun
5977ecef0e
am a7a5fa82: am 06ee8cde: Merge "Remove defunct searchbox implementation from webview." into jb-mr1-dev
...
* commit 'a7a5fa82cc997953b0206c4dd1d2ecc1b27f0cf2':
Remove defunct searchbox implementation from webview.
2012-09-12 15:13:43 -07:00
John Spurlock
4170af8bab
am 6beb7220: am 9f750af6: Update the dream manager to be multi-user aware.
...
* commit '6beb72204346fe75f763592462c9bc2a0b560533':
Update the dream manager to be multi-user aware.
2012-09-12 13:17:57 -07:00
Dianne Hackborn
dea6f14dc0
Merge "resolved conflicts for merge of 8bb779bd to master"
2012-09-12 13:15:07 -07:00
Dianne Hackborn
f41d25a2f5
resolved conflicts for merge of 8bb779bd to master
...
Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052
2012-09-12 10:55:03 -07:00
Geremy Condra
c3ec0d01a6
Push event logging down into libcore.EventLogger
...
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.
Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8
2012-09-11 21:29:06 -07:00
Christopher Tate
99c0cb3b9d
Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
2012-09-11 15:20:34 -07:00
Robert Greenwalt
f008ab727e
am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:09:11 -07:00
Robert Greenwalt
5d33e76cff
am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3
am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Selim Gurun
79ccb1e8a9
Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
2012-09-11 15:01:21 -07:00
Christopher Tate
4dc7a68dbe
Set up default (random) Android IDs for all users
...
Also correct some now-misleading terminology in a permission-check
log message, and fix a bug in which a system component trying to
write to a secondary user's settings would wind up writing the
owner's settings instead.
Bug 7132405
Change-Id: I5b8fafc35720390a01652e386ab5b7c0ad751abe
2012-09-11 14:51:33 -07:00
Vishal Mahaveer
b6b72f5411
EthernetDataTracker: indicate link up based on flags
...
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.
Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com >
2012-09-11 16:41:16 -05: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
faed98a161
Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
2012-09-11 13:23:45 -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
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
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
2fa10c675b
Fix build break
...
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
2012-09-11 11:32:44 -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
6fc7275d0e
Merge "Camera: Add enableShutterSound method." into jb-mr1-dev
2012-09-11 11:06:13 -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
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
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
272e2a5cec
am 23e03832: am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
...
* commit '23e038323dc79c3d5355ba4b4b77060a763a1a91':
Miscellaneous fixes for Settings
2012-09-10 19:25:29 -07:00
Christopher Tate
e1f02ef080
Merge "Miscellaneous fixes for Settings" into jb-mr1-dev
2012-09-10 19:21:53 -07:00
Selim Gurun
6eb6157da6
am d2d3bff2: am befab9e6: Merge "Control access to inherited methods of jsinterface objects" into jb-mr1-dev
...
* commit 'd2d3bff22c339bc30452a6c79b703b6d22f08d3b':
Control access to inherited methods of jsinterface objects
2012-09-10 18:21:14 -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
John Reck
8627875d1c
am 814b9a6c: am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev
...
* commit '814b9a6cc161da3ec5c897783776faf48877d2e5':
Fix some destroy bugs
2012-09-10 17:16:53 -07:00
Katie McCormick
211ae7472f
am 757e5600: am a25526ae: am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit '757e5600d5bc7762d65e682de13ba9fbd0476eea':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-10 17:16:45 -07:00
Siva Velusamy
fbd598fc10
am 5b5d482c: am bc91c5f8: Merge "Report the user id of every app to ddms." into jb-mr1-dev
...
* commit '5b5d482c0c6a048c4a95b63359226ec9015012e9':
Report the user id of every app to ddms.
2012-09-10 17:16:33 -07:00
Dianne Hackborn
9d8d90b59d
am 31c95b93: am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev
...
* commit '31c95b93c64601994732dda6ed9de7c44f838596':
USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
2012-09-10 17:16:25 -07:00