Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,674 Commits 3 Branches 0 Tags
cc6dda77501d0e8dd5ea267f51c02fd120476d28
Commit Graph

31782 Commits

Author SHA1 Message Date
Mathias Agopian
cc6dda7750 am 4c87edfe: am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 
* commit '4c87edfe4d2dce71b7b723f25078cd4bd5d48456':
  always trigger a re-draw when updating the transparent region hint
 2013-04-12 18:05:43 -07:00
Jaikumar Ganesh
7abfc34cd6 am d347d519: am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev 
* commit 'd347d519766e80b27c4f469f391c388c78f75373':
  Fix race condition and disable call.
 2013-04-12 18:05:38 -07:00
Svetoslav
14210466bf resolved conflicts for merge of dd03b6dc to master 
Change-Id: Ie6628e26d8a033bdce54f9d20156b0358a0956c3
 2013-04-12 18:03:50 -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
cbd5fe843d am 64076958: am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 
* commit '640769589b5eb6a4c9a09f8710c3a585320fa075':
  Respect custom view drawing order when dispatching hover events.
 2013-04-12 17:21:52 -07: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
520c1036cb am 019895e2: am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '019895e2e4744f9ddd76f5df6d59a74dbc5bcd42':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:13:39 -07: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
Dianne Hackborn
11dc37686f am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 
* commit '18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93':
  Add new resources trace, also trace apk dex loading.
 2013-04-12 17:06:37 -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
8c176b2513 am b0511d47: am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'b0511d47eb15f4f7941d278467964f2cd6dd2871':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:39:15 -07: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
1d9648df51 am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:26:55 -07: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
6c3ec1cf99 am 82b6de03: am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '82b6de03cf2d3a66881cc3664dfdcf80c885c226':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:14:30 -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
f5539cb30c am a583a5ac: am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 
* commit 'a583a5ac7fcf5b1478297e20b2cd34872f0e18e9':
  Trace ValueAnimator based animations in systrace
 2013-04-12 14:04:10 -07:00
Romain Guy
190a0f24db am a378bab7: am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 
* commit 'a378bab7a7ea4f748c72b0d14acbdf9359dbebfb':
  Add async events tracing to android.os.Trace
 2013-04-12 14:04:07 -07: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
d65b268fcd am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev 
* commit '9b8abb5abde4264b6ed4e022804c743faf68323d':
  Add user restrictions (credentials, user removal)
 2013-04-12 13:29:35 -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
c1f5756c23 am 1aa52487: am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev 
* commit '1aa524878591dce809000e7263378138ccd6a25a':
  Fix for bug 8500202: Right-to-left text not showing in list view
 2013-04-12 13:15:37 -07: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
720471f0fd am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev 
* commit '2d28d6229f8cb5e158998de421ee0a0d1ff865fe':
  Add new route.hasGateway() api
 2013-04-12 12:11:20 -07:00
Craig Mautner
ffe0c56c29 am 429664a5: am d5e7b8bf: Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev 
* commit '429664a52ab0d024757650a246297ae8224e60dc':
  Clear test rectangle if previous focus is null.
 2013-04-12 12:11:17 -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