Jeff Sharkey
252b262f25
am d6d2ac80: am c4715678: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit 'd6d2ac8042350b2949f0d0369cb7bc22bb1c55f0':
Update docs for multi-user storage behavior.
2012-10-23 09:17:18 -07:00
Jeff Sharkey
d6d2ac8042
am c4715678: am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit 'c47156781c1b348df7c6b40d0af8d173c08293a2':
Update docs for multi-user storage behavior.
2012-10-23 09:14:00 -07:00
Jeff Sharkey
c47156781c
am 1c8135ad: Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
...
* commit '1c8135adba37ac09fe661180237df446611daa4b':
Update docs for multi-user storage behavior.
2012-10-23 09:10:43 -07:00
Jeff Sharkey
1c8135adba
Merge "Update docs for multi-user storage behavior." into jb-mr1-dev
2012-10-23 09:08:42 -07:00
erin rosenthal
b095e494b0
am a7edbbdd: am 76c5144e: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
...
* commit 'a7edbbdd8dc73cb0d9e9c0726a72cfe01b5fb80f':
Catch badly formed URLs in WebView accessibility injector.
2012-10-22 18:02:12 -07:00
erin rosenthal
a7edbbdd8d
am 76c5144e: am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
...
* commit '76c5144ec7b1c80025bc7892ff51939a47c3ca53':
Catch badly formed URLs in WebView accessibility injector.
2012-10-22 17:59:44 -07:00
erin rosenthal
76c5144ec7
am 36425d19: Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
...
* commit '36425d19fc578c2042098d2045092990a811d0e6':
Catch badly formed URLs in WebView accessibility injector.
2012-10-22 17:56:27 -07:00
erin rosenthal
36425d19fc
Merge "Catch badly formed URLs in WebView accessibility injector." into jb-mr1-dev
2012-10-22 17:53:27 -07:00
Raph Levien
103dbdc5a6
am fdf26397: am 9defd066: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
...
* commit 'fdf263971b3bbc93d743195e840967063ccf5fcb':
Fix for bug: Gmail (and other places): cursor placed on top of letter
2012-10-22 16:04:12 -07:00
Raph Levien
fdf263971b
am 9defd066: am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
...
* commit '9defd0663e2b6a486f5bc72621bbbd4dfab666fb':
Fix for bug: Gmail (and other places): cursor placed on top of letter
2012-10-22 16:01:39 -07:00
Raph Levien
9defd0663e
am 74437532: Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
...
* commit '74437532fe2a3e9ebd15c61327fd3f2b68c299b3':
Fix for bug: Gmail (and other places): cursor placed on top of letter
2012-10-22 15:59:22 -07:00
Raph Levien
74437532fe
Merge "Fix for bug: Gmail (and other places): cursor placed on top of letter" into jb-mr1-dev
2012-10-22 15:56:01 -07:00
Jeff Sharkey
8c16579994
Update docs for multi-user storage behavior.
...
Define external storage as being isolated for each user, with the
caveat for shared OBB files. Also mention external storage
permissions.
Bug: 7384941
Change-Id: Ib156b5874c5587749d7bc066791e9e88d931b174
2012-10-22 15:04:35 -07:00
Raph Levien
42ef515d18
Fix for bug: Gmail (and other places): cursor placed on top of letter
...
This patch fixes bug 7346656. In this particular case, the text line in
the EditText was split into multiple spans, with the boundary between
the "r" and "," in "r,". These were being drawn as two separate runs,
but measured as a single run, leading to inconsistent measurements
because this is a kern pair in Roboto.
The fix is to eliminate the special-case code for measuring. This will
actually improve efficiency, as the value computed in one pass is now
more likely to be reused in another.
Change-Id: I04142a0ec98f280fc1027c7cbdbf903e3096f8e4
2012-10-22 15:01:17 -07:00
Jamie Gennis
e8c18cb36b
am 5bbfcd3e: am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '5bbfcd3e15048f94310da6cba85be8ab047c0e8b':
Set the secureness when creating displays
2012-10-22 13:57:55 -07:00
Jamie Gennis
5bbfcd3e15
am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
Set the secureness when creating displays
2012-10-22 13:54:53 -07:00
Jamie Gennis
9fee7bd73d
am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
2012-10-22 13:52:12 -07:00
Jamie Gennis
23d622418b
Merge "Set the secureness when creating displays" into jb-mr1-dev
2012-10-22 13:49:35 -07:00
Amith Yamasani
6861a6147c
am e78d50b4: am 6eb9844c: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
...
* commit 'e78d50b4a02a8242a99dea4cfacee2a7c9e7f122':
System server should always send broadcasts to a specific or all users
2012-10-22 13:40:12 -07:00
Amith Yamasani
e78d50b4a0
am 6eb9844c: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
...
* commit '6eb9844c8e4ff36ebb58a9e5223e69adea1156cf':
System server should always send broadcasts to a specific or all users
2012-10-22 13:37:19 -07:00
Amith Yamasani
6eb9844c8e
am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
...
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
System server should always send broadcasts to a specific or all users
2012-10-22 13:35:21 -07:00
Amith Yamasani
2278898126
Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
2012-10-22 13:32:24 -07:00
Amith Yamasani
cd75706117
System server should always send broadcasts to a specific or all users
...
Bug: 7368245
Log a warning if the system process calls unqualified sendBroadcast()
and other calls.
As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.
Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
2012-10-22 12:38:53 -07:00
Adam Powell
c5b9ea70b9
am f4c6a4e4: am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'f4c6a4e42e11a8bf829335426d67be92b0e7ab5c':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:37:34 -07:00
Adam Powell
f4c6a4e42e
am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'cad6dce59653bf0a5ad015ab936948497f58b3b4':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:34:18 -07:00
Adam Powell
cad6dce596
am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:31:35 -07:00
Adam Powell
5311c4476e
Remove View's long press callbacks when ACTION_CANCEL is received
...
Bug 7391646
Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
2012-10-22 12:15:49 -07:00
Daniel Sandler
c2c4f8d895
am 50ad6326: am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
...
* commit '50ad6326c5814d092cf1510847bcdfb940a46738':
New lockscreen: allow search gesture from nav bar.
2012-10-22 08:07:05 -07:00
Daniel Sandler
50ad6326c5
am 466b77e9: am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
...
* commit '466b77e9951aa6dab0d721e1d9bfb805bb37ffc5':
New lockscreen: allow search gesture from nav bar.
2012-10-22 08:04:38 -07:00
Daniel Sandler
466b77e995
am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
...
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
New lockscreen: allow search gesture from nav bar.
2012-10-22 08:02:32 -07:00
Daniel Sandler
2dd0c3a576
Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
2012-10-22 07:59:18 -07:00
Amith Yamasani
0ad9356bdc
am 283d1409: am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit '283d1409ddadd35cd41b5496659d3a24dc365fb0':
Fix crashes when quickly adding and removing users
2012-10-21 07:53:56 -07:00
Amith Yamasani
283d1409dd
am f624d72c: am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit 'f624d72cb0fe40fd5748d4f0d1a93bf267aa3ed8':
Fix crashes when quickly adding and removing users
2012-10-21 07:50:55 -07:00
Amith Yamasani
f624d72cb0
am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
...
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
Fix crashes when quickly adding and removing users
2012-10-21 07:48:02 -07:00
Amith Yamasani
8074e98b20
Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
2012-10-21 07:44:46 -07:00
Fabrice Di Meglio
3c371b28ef
am 0be6a28e: am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '0be6a28ed5f27217d66c69195524d8747a6975bc':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:22:05 -07:00
Fabrice Di Meglio
0be6a28ed5
am 08f27b1b: am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '08f27b1bffbf01d9e5a102b8c90a3c2095fc82b3':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:19:00 -07:00
Fabrice Di Meglio
08f27b1bff
am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
...
* commit '59420ecd1518289cc47c32181250539c981f85f0':
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
2012-10-19 19:17:06 -07:00
Fabrice Di Meglio
59420ecd15
Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
2012-10-19 19:14:30 -07:00
Fabrice Di Meglio
d3156a2a56
Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
...
This was a regression introduced by a previous CL.
- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.
The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.
Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
2012-10-19 18:46:43 -07:00
Jamie Gennis
7bbf8163fb
Set the secureness when creating displays
...
This change makes use of the new 'secure' argument to the
ISurfaceComposer::createDisplay method. In this change both the overlay and
wifi displays are hard-coded to be non-secure displays.
Bug: 7368436
Change-Id: Ib65312f2adab5104d8deefbfc32af9dc106a9129
2012-10-19 18:34:35 -07:00
Amith Yamasani
db6a14cc85
Fix crashes when quickly adding and removing users
...
Make USER_REMOVED an ordered broadcast and send it before the user's
state is completely removed from the system. This gives services the
opportunity to clean up their state, while still having access to the
user's directory and UserInfo object (such as serial number).
Tell SyncManager to skip over dying/partially created users.
Improve UserManager tests, waiting for users to be removed fully.
Bug: 7382252
Change-Id: I93cfb39c9efe6f15087bf83c569a2d154ef27168
2012-10-19 16:23:30 -07:00
Christopher Tate
58fc8e5ada
am 9fffd565: am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
...
* commit '9fffd565a927f03d10c2009b741e7222ddd4967e':
Document immutable requirement of SharedPreferences return objects
2012-10-19 14:46:48 -07:00
Christopher Tate
9fffd565a9
am e9472f29: am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
...
* commit 'e9472f2937478ead4a5c2115ee69e508e4933417':
Document immutable requirement of SharedPreferences return objects
2012-10-19 14:43:50 -07:00
Christopher Tate
e9472f2937
am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
...
* commit '935415a050be75f582f632dd168be9fbb047137b':
Document immutable requirement of SharedPreferences return objects
2012-10-19 14:41:16 -07:00
Christopher Tate
935415a050
Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
2012-10-19 14:38:05 -07:00
Daniel Sandler
d5483c3157
New lockscreen: allow search gesture from nav bar.
...
Show a lights-out pip if home is invisible but search is
still OK.
Change-Id: Ifc69c12296cc8e8cf7c89dd06173d7abf499a878
2012-10-19 16:48:12 -04:00
Christopher Tate
01ed79c578
Document immutable requirement of SharedPreferences return objects
...
In particular, make it quite clear that the set returned by
getStringSet() must not be modfied by the app, period; and
add a similar caution about the map returned via getAll().
Also, fix a bug that could lead to unexpected data being committed
if the set instance passed to putStringSet() was mutated by the
app after that call (including mutations after commit() was
invoked).
Bug 7312641
Change-Id: If9a1be1b0669ac879ff7a7dc67a8805548ea10cc
2012-10-19 13:43:52 -07:00
Alon Albert
7b78f5001a
Merge "Add sync reason to dumpsys"
2012-10-19 13:43:16 -07:00
alanv
ac6e50a671
Catch badly formed URLs in WebView accessibility injector.
...
Bug: 7206684
Change-Id: I13e8f29043314430ea3fcfa8ab59040136d06e57
2012-10-19 12:57:41 -07:00