Amith Yamasani
19c95bcc76
am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev
...
* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
Introducing manifest flag requiredAccountType
2013-04-13 15:56:31 -07:00
Amith Yamasani
e188c984dd
Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev
2013-04-13 22:54:01 +00:00
Dianne Hackborn
00c4c67069
am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev
...
* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
Add a little more resource load tracing.
2013-04-12 18:07:12 -07:00
Dianne Hackborn
301e95f2e1
Merge "Add a little more resource load tracing." into jb-mr2-dev
2013-04-13 01:03:47 +00:00
Amith Yamasani
ccbe389b4d
Introducing manifest flag requiredAccountType
...
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.
Bug: 8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
2013-04-12 17:52:42 -07:00
Dianne Hackborn
0acc1931d3
Add a little more resource load tracing.
...
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
2013-04-12 17:49:17 -07:00
Mathias Agopian
4c87edfe4d
am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev
...
* commit '1763d6f957163faf6d3b629c36f4e8e90e0e31bd':
always trigger a re-draw when updating the transparent region hint
2013-04-12 17:32:32 -07:00
Mathias Agopian
1763d6f957
Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev
2013-04-13 00:28:16 +00:00
Jaikumar Ganesh
d347d51976
am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev
...
* commit '02087754fb49de7421b982267a283482b70bc297':
Fix race condition and disable call.
2013-04-12 17:25:41 -07:00
Jaikumar Ganesh
02087754fb
Merge "Fix race condition and disable call." into jb-mr2-dev
2013-04-13 00:22:07 +00:00
Svetoslav Ganov
dd03b6dcb7
am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev
...
* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
Allow for setting test type as a monkey.
2013-04-12 17:17:59 -07:00
Svetoslav
640769589b
am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev
...
* commit '72ab9b801794d42de83d3e7afb70ccc96ade7dfb':
Respect custom view drawing order when dispatching hover events.
2013-04-12 17:17:57 -07:00
Svetoslav Ganov
26257a09a5
Merge "Allow for setting test type as a monkey." into jb-mr2-dev
2013-04-13 00:15:40 +00:00
Svetoslav
72ab9b8017
Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev
2013-04-13 00:14:56 +00:00
Kenny Root
019895e2e4
am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev
...
* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted
2013-04-12 17:09:57 -07:00
Kenny Root
8692685a54
Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev
...
* changes:
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted
2013-04-13 00:04:17 +00:00
Dianne Hackborn
18e99d1d5f
am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
...
* commit '15fed390c44972932f6dd7ce3bef1004e8b98b61':
Add new resources trace, also trace apk dex loading.
2013-04-12 17:03:03 -07:00
Mathias Agopian
54e3d38490
always trigger a re-draw when updating the transparent region hint
...
since SF now relies on receiving a frame for latching the
transparent region hint, we make sure we will indeed redraw
something.
Bug: 8581533
Change-Id: Ia12ddf5654a7deeac7628b799bfde4b8c16c992b
2013-04-12 17:01:44 -07:00
Svetoslav
0e5e9aa8e5
Respect custom view drawing order when dispatching hover events.
...
1. The event dispatch methods should respect the child drawing order.
Hover event dispatch in ViewGroup was not repsecting this order.
bug:8606799
Change-Id: Ie2fd3aff1292c21df23a04ca0aa03a97813c44ef
2013-04-12 16:59:03 -07:00
Dianne Hackborn
15fed390c4
Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
2013-04-12 23:58:50 +00:00
Amith Yamasani
b0511d47eb
am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
...
* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
Rename isUserRestricted to isUserLimited
2013-04-12 15:36:22 -07:00
Amith Yamasani
e107aa4386
Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
2013-04-12 22:33:05 +00:00
Chet Haase
d04215c440
am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
...
* commit '0a41431d697a34e7fe4ed2c481484d7a63949037':
API and doc cleanup, plus small animation/UI features
2013-04-12 15:23:22 -07:00
Chet Haase
0a41431d69
Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87
Rename isUserRestricted to isUserLimited
...
Avoid confusion with user restrictions which can be applied to
non-limited users as well.
Updated the java docs.
Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
2013-04-12 15:13:53 -07:00
Dianne Hackborn
f7be4800df
Add new resources trace, also trace apk dex loading.
...
Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
2013-04-12 14:53:10 -07:00
Kristian Monsen
82b6de03cf
am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev
...
* commit '03499a23f9d84fab95a7383b50cc7f87a974e4a8':
Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
2013-04-12 14:10:48 -07:00
Kristian Monsen
03499a23f9
Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev
2013-04-12 21:05:15 +00:00
Romain Guy
a583a5ac7f
am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev
...
* commit 'dec4bb9e4b5a46b179a6aa3e90f9d9240d9c99cb':
Trace ValueAnimator based animations in systrace
2013-04-12 14:00:34 -07:00
Romain Guy
a378bab7a7
am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev
...
* commit '50b68bf8364fd728553cb8066ece8f7905885625':
Add async events tracing to android.os.Trace
2013-04-12 14:00:31 -07:00
Romain Guy
dec4bb9e4b
Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev
2013-04-12 20:58:36 +00:00
Romain Guy
50b68bf836
Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev
2013-04-12 20:58:00 +00:00
Chet Haase
430742f090
API and doc cleanup, plus small animation/UI features
...
Adding features which round out the animation APIs (missing
getters, etc.). Also fix doc typos.
Issue #8350510 Add APIs needed for future animation capabilities
Change-Id: I063736848ba26e6d6c809b15fc3a103c74222f46
2013-04-12 13:44:22 -07:00
Emily Bernier
9b8abb5abd
am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
...
* commit 'ce70311b67c3dba6ed4fbda41617f4e24c82dfc7':
Add user restrictions (credentials, user removal)
2013-04-12 13:25:58 -07:00
Emily Bernier
ce70311b67
Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
2013-04-12 20:21:36 +00:00
Raph Levien
1aa5248785
am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev
...
* commit '6c0724010f1a98e391827109c2c369b64197c449':
Fix for bug 8500202: Right-to-left text not showing in list view
2013-04-12 13:11:31 -07:00
Raph Levien
6c0724010f
Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev
2013-04-12 20:08:33 +00:00
Adam Momtaz
8f6f1f43ee
Allow for setting test type as a monkey.
...
1. This allows UiAutomation type tests to run as if an
android monkey test is running. This allows applications
that recognize that they are drive by a test framework and
avoid performing certain actions such as calling 911.
2. Fixed a bug where the UiAutomation#disconnect() was not
called when the instrumentation is shutdown.
bug: 8588857
Change-Id: I9e3624dfbe2b8f81f27805711de1098ea2edd03d
2013-04-12 12:54:34 -07:00
Robert Greenwalt
2d28d6229f
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
...
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
Add new route.hasGateway() api
2013-04-12 12:07:14 -07:00
Craig Mautner
429664a52a
am d5e7b8bf: Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev
...
* commit 'd5e7b8bfb4381baa36feb241bc65d4681f664592':
Clear test rectangle if previous focus is null.
2013-04-12 12:07:11 -07:00
Robert Greenwalt
3016244ffb
Merge "Add new route.hasGateway() api" into jb-mr2-dev
2013-04-12 19:02:24 +00:00
Craig Mautner
d5e7b8bfb4
Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev
2013-04-12 19:02:06 +00:00
Raph Levien
f5cf6c9d44
Fix for bug 8500202: Right-to-left text not showing in list view
...
In single line mode, changing the text from LTR to RTL (or vice versa)
affects the alignment, which in turn means that bringTextIntoView is
needed to update the scrolling. A registerForPredraw should be done to
make this happen, but it was missing. This patch tests explicitly for
direction changes in this case, and schedules a predraw if so.
Change-Id: I16e0e23141c244dc8adc00ea8306dfe4c9bf487d
2013-04-12 11:42:25 -07:00
Robert Greenwalt
ca441ee2f0
Add new route.hasGateway() api
...
Fixes issues brought in by change to isHostRoute. isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.
bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
2013-04-12 11:22:52 -07:00
Jaikumar Ganesh
2e90089766
Fix race condition and disable call.
...
1. A dispatch event can happen as soon you call enabled,
and we won't be ready to receive it. Also add error checks
and not crash if such a thing happens.
2. Java layer shouldn't call disable on the native layer
for trigger sensors. Native layer will clean up on its own.
b/8165631
Change-Id: Icbe76bd1f50632c0bcb0b3b04975b2c2f20ff36b
2013-04-12 09:37:59 -07:00
Svetoslav
9d02928e43
am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
...
* commit '14c8c741f79983578a8e9c5124d142c6d85ab91b':
Adding APIs for an accessibility service to intercept key events.
2013-04-11 22:48:39 -07:00
Svetoslav
14c8c741f7
Merge "Adding APIs for an accessibility service to intercept key events." into jb-mr2-dev
2013-04-12 05:45:43 +00:00
Kristian Monsen
3b9e272e0e
am 83b00258: Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev
...
* commit '83b002584ce27e3f405d224c0ce83d69516f87d8':
Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread
2013-04-11 21:53:52 -07:00
Kristian Monsen
83b002584c
Merge "Fix for bug 8577776 Throw exception if app calls WebView used on wrong thread" into jb-mr2-dev
2013-04-12 04:50:20 +00:00
Jeff Brown
dc5711eaef
am bf26c9cf: Merge "Ensure looper quits after all other messages are handled." into jb-mr2-dev
...
* commit 'bf26c9cf87d3b83723fd12f4678b8b4286d8d08a':
Ensure looper quits after all other messages are handled.
2013-04-11 21:08:38 -07:00