Commit Graph

4981 Commits

Author SHA1 Message Date
Paul Duffin
10a9bd905c Merge "Use junit-host instead of junit" am: 6063357ae6 am: 6fc0c5ceca am: 32317b3c8d
am: 29bf88aca9

Change-Id: I2f75d5e80d9baa411e7816958d4a6d6d220d0ba9
2016-11-29 15:31:57 +00:00
Paul Duffin
6fc0c5ceca Merge "Use junit-host instead of junit"
am: 6063357ae6

Change-Id: I6522cedeb522fa01530d4f31b6505b4d4c265312
2016-11-29 15:12:46 +00:00
Paul Duffin
4a064d2010 Use junit-host instead of junit
Bug: 30188076
Test: make checkbuild
Change-Id: I3496b9d7e40abf7712a56ba633a2becd0aa17c06
2016-11-29 14:52:42 +00:00
TreeHugger Robot
d25cf04e98 Merge "Add explicit method to dismiss Keyguard" 2016-11-29 14:30:46 +00:00
Paul Duffin
4aab571757 Merge "Use junit-host instead of junit" am: 7dda7e1e81 am: bbb501281e am: 52277efa6c
am: 2d4183ffa5

Change-Id: I1cc3bc8b73d7756c850a1573ca5ff9090e64c184
2016-11-29 10:39:06 +00:00
Paul Duffin
bbb501281e Merge "Use junit-host instead of junit"
am: 7dda7e1e81

Change-Id: Ie070bf5329899f21e3fb65dae6db5fdd50e74ba9
2016-11-29 10:22:34 +00:00
Paul Duffin
7dda7e1e81 Merge "Use junit-host instead of junit" 2016-11-29 10:12:52 +00:00
Andreas Gampe
d6d10b6c78 Preload2: Add isSingleThreaded am: 3bf65c916c am: 57c14c8ee6 am: 80ae2ed225
am: 190dbbd0af

Change-Id: I1728bb69b359ece93ba2e89f5aa86407e9b17787
2016-11-29 03:47:50 +00:00
Andreas Gampe
8e2338f72d Preload2: Fix action inheritance am: 1c809a3d32 am: 24cd3418c7 am: 2b34ac2bd6
am: 26c94b7430

Change-Id: Ic6fde07acce3b6d0ab1708c3aff57e8aabb3fe96
2016-11-29 03:46:38 +00:00
Andreas Gampe
f237a11fb0 Preload2: Abstract out UI am: 5cb8998363 am: 826ec71e96 am: eab0eadbf6
am: af5b2c3010

Change-Id: I17fe36f9d2df61f0da1bc229f7a77a5e3f16f45b
2016-11-29 03:45:41 +00:00
Andreas Gampe
57c14c8ee6 Preload2: Add isSingleThreaded
am: 3bf65c916c

Change-Id: I6bf6c5b934cb89937bb329ea7b9f50c70b3a898d
2016-11-29 03:20:51 +00:00
Andreas Gampe
24cd3418c7 Preload2: Fix action inheritance
am: 1c809a3d32

Change-Id: I8ef23a6ee16b1462d65ef2d7a3f62e9d586c92ff
2016-11-29 03:20:12 +00:00
Andreas Gampe
826ec71e96 Preload2: Abstract out UI
am: 5cb8998363

Change-Id: Ia4a147e061397951ada72beac7c5781b8dbac918
2016-11-29 03:19:34 +00:00
Andreas Gampe
3bf65c916c Preload2: Add isSingleThreaded
Expose whether a UI is single-threaded to avoid spawning threads
in actions.

Bug: 31961946
Test: manual
Change-Id: I37c8daa6a00784e833bad53b8e83ab4417955df7
2016-11-28 15:06:35 -08:00
Andreas Gampe
1c809a3d32 Preload2: Fix action inheritance
Use AbstractThreadedAction as a base.

Bug: 31961946
Test: manual
Change-Id: I5a05b65d753be775c8b8382bb1a81e869c388f8d
2016-11-28 15:04:25 -08:00
Andreas Gampe
5cb8998363 Preload2: Abstract out UI
Create IUI interface and move UI to SwingUI.

Bug: 31961946
Test: manual
Change-Id: If56347fdde8b441c0c01337a3f5eac002ea5b4f3
2016-11-28 13:15:10 -08:00
Paul Duffin
21cf84f8b3 Use junit-host instead of junit
Bug: 30188076
Test: make checkbuild
Change-Id: I5d3efbfbe3245a631113674bff1b0aabdc9fe8be
2016-11-28 16:44:44 +00:00
Jerome Gaillard
f149ca784d Override TextServicesManager in layoutlib
When a TextServicesManger is required in layoutlib, provide a fake
one.

Test: Run layoutlib tests
Change-Id: I8c25f4919a2e97b56f705b59747e81cb6f45b07b
2016-11-28 15:54:55 +00:00
Jerome Gaillard
f666c0e2ea Fix layoutlib to reflect recent changes in platform code
Test: Layoutlib tests
Change-Id: I81964233a9e580ccee9c9e9b0cf3525babf30bd4
2016-11-28 10:40:33 +00:00
Diego Perez
5017ece983 Update allwidgets golden image
Test: Updating existing test
Change-Id: Ie66abc77ec6013a8094d6b8be2666b69c973a295
(cherry picked from commit 48d6ec53f9c75571217880ef77902f582723418b)
2016-11-25 12:36:12 +00:00
Jerome Gaillard
8deff10ff9 Merge "Fix shadow painting in layoutlib" 2016-11-25 12:04:03 +00:00
Jerome Gaillard
2dd5018a0f Merge "Add missing ServiceNotFoundException class" 2016-11-24 21:49:48 +00:00
Jerome Gaillard
d38fffd38d Store failure thumbnails in CWD/out/failures
When a test fails in layoutlib, store the resulting png files in
out/failures subdirectory of the current working directory.
That avoids the risk of collisions if tests for several branches
of layoutlib are run at the same time.

Test: Run tests in layoutlib with at least one failing test
Change-Id: I31594a871e481e6aa410a165926ce544dc7ddcf2
(cherry picked from commit 82ebb9058479de56860f348ab969160e0d8294b6)
2016-11-24 16:43:30 +00:00
Jerome Gaillard
555fcd5579 Fix shadow painting in layoutlib
Shadows could be painted outside of the allowed drawing region
for the components for which they are the shadow.

Bug: http://b.android.com/215402
Change-Id: I2d2821b745147f3723e8f11d648094fcd684fe51
(cherry picked from commit 9702fffc768db43d0aba4fb1bea54af50af11361)
2016-11-24 16:42:12 +00:00
Jerome Gaillard
e3607d2cc7 Add missing ServiceNotFoundException class
This class was added in ServiceManager.java in commit 49ca529a85.
Layoutlib rewrites the entire ServiceManager class, so it also
needs to define ServiceNotFoundException.

Test: TestDelegates.testMethodDelegates
Change-Id: Ia68399e8baa973ae961eabe929ca3d1019f20ba7
2016-11-24 16:24:28 +00:00
Jorim Jaggi
241ae10b21 Add explicit method to dismiss Keyguard
The flag is a bit clunky for most cases, and a method is more
clear.

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardTests

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardLockedTests

Test: runtest systemui -c
com.android.systemui.keyguard.DismissCallbackRegistryTest

Bug: 30961403
Bug: 27422134
Change-Id: I39de90c7cfecd99350a74f72cd76418e337f2b79
2016-11-23 16:27:35 +01:00
Diego Perez
dc3bb324ce Fix tests when running from the command line
When loading classes from the jar file, we can't just use the
URLClassLoader since it can not enumerate files in a jar directory.
Restoring the ModuleClassLoader and making all paths relative to the
system class loader (as opposed to relative to the class location).

Change-Id: Ib3f5d12dd5c964d0ba9cc6c5ec9cb556c989e653
(cherry picked from commit 2a4a6c81f8a103be5c48d8a0605a3e4416e8f7f1)
2016-11-23 11:01:44 +00:00
Bartosz Fabianowski
1133424c2b Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API
Settings needs to access a variant of getInstalledApplications() which
takes a |userId| argument. Since this is not currently exposed by
PackageManager, Settings calls into PackageManagerService directly. This
is ugly and breaks the regular abstraction layer hierarchy.

The CL fixes the problem by exposing the required variant of
getInstalledApplications() as a hidden API, analogously to what was done
before with getInstalledPackages().

Bug: 32692748
Test: Will be CTS-verifier-tested together with Settings
Change-Id: Id9c4e8e18524d312159821f1a4d5527263c7e950
2016-11-17 20:49:16 +01:00
Andreas Gampe
6a0cb767b2 Merge "Preload2: Fix dependencies" am: 3b379ee94e am: 74b4e070be am: 6a454c86db
am: c89bd30cee

Change-Id: I613d29d4a32266282d73a1c61482fd5a35f58953
2016-11-16 18:47:34 +00:00
Andreas Gampe
74b4e070be Merge "Preload2: Fix dependencies"
am: 3b379ee94e

Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
2016-11-16 18:25:37 +00:00
Diego Perez
c318f0b408 More layoutlib testing infra fixes
- Remove ModuleClassLoader as it can be replaced with a URLClassLoader
  for now.
- Move CustomCalendar and CustomDate to a separate package that can be
  used both by the Bridge tests and the actual test app.
- Move empty.xml out of the test app so it compiles.
- Update test app to use the latest build tools and SDK (some attributes
  being used by the app weren't supported in API 21).
- Update gitignore to remove the new out directory.

Test: Update to existing tests
Change-Id: Ieb7324d5ae559f9c581771c57f2127cd83909015
2016-11-15 14:11:33 +00:00
Andreas Gampe
da69216ac6 Preload2: Fix dependencies
Also depend on and package tools-common.

Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
2016-11-14 19:08:22 -08:00
Jerome Gaillard
e6f30eec36 Fix testActivity on buildbot
Follow-up to commit 896cc3a794, the class file also needed to be
updated. The golden file of testActivity is also updated to be
the one built with jdk1.8.0_60 which is the one running on buildbot.

Test: Run testActivity
Change-Id: I7f3cfc1123160005c3cb5fa4213db6ae3a48457d
(cherry picked from commit aab13aee9a11c340952c24f2410940df59996816)
2016-11-14 18:05:57 +00:00
Jerome Gaillard
7638c49c84 Change date on CustomCalendar
The date of the calendar is set by converting the epoch time based on
the local time zone. We choose at date at 12:00 GMT so that it will
be on the same day no matter which time zone is considered.

Test: part of testActivity
Change-Id: Ib36a5b45f69323265dd5ceaa17eeac553fc2d071
(cherry picked from commit 896cc3a794bb6e173c1e53e97f70007c3e24de38)
2016-11-14 11:01:33 +00:00
Jerome Gaillard
4570fc9f28 Merge "Rename native methods that were changed in the platform" 2016-11-14 11:00:51 +00:00
Ben Lin
bbd711c2a5 Merge "Adding ContentProvider#refresh and ContentResolver#refresh." 2016-11-11 19:13:40 +00:00
Jerome Gaillard
a10973ebd1 Rename native methods that were changed in the platform
This is following commits f22859757b, 94931bd87e, 4387190d8e
and caa08ff5e9.

Test: Run TestDelegates
Change-Id: If90028492c036fc5f69913e4dcad5a1a5fca4b55
2016-11-11 14:11:03 +00:00
Ben Lin
1cf454fcb6 Adding ContentProvider#refresh and ContentResolver#refresh.
Original CL is from ag/1568530.

Bug: 31647485
Change-Id: Ib45fc995a361b8c75cd3600f638910b18a263d51
2016-11-10 13:53:27 -08:00
Jerome Gaillard
3911cee2cf Update testActivity
Put android:animateFirstView false in the test application theme
so that the date picker view displays fully.
Update the golden image to reflect the changes.

Change-Id: If57fac5c182dd69b4b4d4fcc30d6f17a8f67ad68
(cherry picked from commit 96970138fc1c8d928a6d3ec362865e6c626f56e4)
2016-11-10 16:35:09 +00:00
Tamas Berghammer
67387af732 Merge "Update package names to work with the proto3 compiler" 2016-11-09 13:38:58 +00:00
Adam Lesinski
f96789d37c Merge "Add font type to AAPT2" 2016-11-08 23:03:58 +00:00
Tamas Berghammer
383db5ebcc Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
2016-11-08 14:06:09 +00:00
Diego Perez
8f61cb3301 Merge "Fix themed attributes resolution" 2016-11-08 12:03:19 +00:00
John Reck
946d11d216 Merge "Re-unite sources with their headers"
am: e43444a00b

Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
2016-11-04 21:47:34 +00:00
John Reck
03b5d506bc Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6)
2016-11-04 13:27:37 -07:00
John Reck
437d4e0daf Merge "Re-unite sources with their headers" 2016-11-04 19:32:06 +00:00
Paulo Casanova
a256408b24 Renamed Aapt2.java to Aapt2Jni.java.
See http://ag/1590668 for a discussion.

Test: Done in tools
Change-Id: I3bfced0da98ab24531c1c1a79970841b32bfa1fa
2016-11-04 11:28:44 +00:00
John Reck
f6113af2d6 Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
2016-11-03 16:26:59 -07:00
Paulo Casanova
573cccfea7 Merge "Updated JNI interface." 2016-11-03 18:39:04 +00:00
Paulo Casanova
b555b59f2e Updated JNI interface.
Added new "ping" method used to detect if the shared
library has already been loaded.

Fixed a few bugs in the implementation (and now it works
from the Java side).

See http://ag/1590668 for the implementation on devtools.

Test: Done on the tools side
Change-Id: Ifa41073dc3b6ac69cdb9f77e655bf261c3b4c3d1
2016-11-03 10:14:42 +00:00