228422 Commits

Author SHA1 Message Date
Aga Wronska
43551a2a2f Merge "Pressing back button clears search" 2015-12-22 22:08:08 +00:00
Dan Willemsen
6ea25250a8 Merge "AAPT2: Fix compiler error in 32-bit host test" 2015-12-22 21:55:36 +00:00
Philip P. Moltmann
4f71bcec22 Merge "Allow a print service to specify per printer icons, description and info-activities" 2015-12-22 21:49:30 +00:00
Dan Willemsen
1b1f1b14ee AAPT2: Fix compiler error in 32-bit host test
We now default host native tests to build both 32-bit and 64-bit
versions.

The 32-bit version of libaapt2_test was broken because it was comparing
an unsigned int to the result from std::count(std::vector), which is a
signed int. The 64-bit version compiled fine, since
std::count(std::vector) returns a long.

Change-Id: I786fcd8a54d9f78b76b19ef82ab8dda6f5c42197
2015-12-22 13:44:56 -08:00
Aga Wronska
43f20493d0 Pressing back button clears search
Bug:26143308
Change-Id: Iaa02d39a6ee1fd1a0c7d4d07453a481af97c7664
2015-12-22 13:24:52 -08:00
Rob Carr
d27cf02d91 Merge "Set SCALING_MODE_NO_SCALE_CROP for SurfaceView." 2015-12-22 21:07:45 +00:00
David Riley
1b3b8b74ae Merge "SystemUI: implement bluetooth scan timeout" 2015-12-22 18:45:06 +00:00
Filip Gruszczynski
9a6fb02f59 Merge "Add a permission to shell for running multi window tests." 2015-12-22 17:29:39 +00:00
Filip Gruszczynski
1ca4e549d9 Add a permission to shell for running multi window tests.
Bug: 19225708
Change-Id: Ia2de679b133acee992ccdab3bfddbdd9d78f5025
2015-12-22 09:22:34 -08:00
Benjamin Franz
b0521256d6 Merge "Allow device and profile owner to modify accounts" 2015-12-22 17:00:19 +00:00
Jason Monk
e06900b769 Merge "QS: Fix header layout when alarm set" 2015-12-22 16:37:24 +00:00
Jason Monk
6923bc806f QS: Fix header layout when alarm set
Change-Id: I9f16ccb545abaea85ecaca29a221599c767003b8
2015-12-22 11:34:36 -05:00
Benjamin Franz
b6c0ce4ac9 Allow device and profile owner to modify accounts
The user restriction DISALLOW_MODIFY_ACCOUNTS and the policy
DPM.setAccountManagementDisabled can now be circumvented by a device
or profile owner. This allows the device or profile owner to add
accounts without briefly having to remove the policy.

Bug: 22030831
Change-Id: I2b59c4b3ad354287d7a00f21b2afef072d12517d
2015-12-22 15:50:30 +00:00
Chris Wren
0543b2369e Merge "that works, but can you find a more efficient solution?" 2015-12-22 15:37:04 +00:00
Chris Wren
19a02b0f08 that works, but can you find a more efficient solution?
Change-Id: I19f8ff61973d8db5614f9a699b28df7038e44711
2015-12-22 10:34:22 -05:00
Jorim Jaggi
406585a7e3 Reenable colored bars for multiwindow
Fix the previous bug that caused that we needed to disable colored bars
by only forcing the layout fullscreen flag for windows that would like
to be laid out with MATCH_PARENT.

Bug: 26050571
Bug: 24365214
Change-Id: I4f197ae5e2bf042980f5e8dc9eb852843af9859c
2015-12-22 15:11:28 +00:00
Filip Gruszczynski
fc14bc70e1 Merge "Remove confusing logging about surface size." 2015-12-22 15:08:44 +00:00
Jorim Jaggi
79b39f0873 Update visual of docked divider to spec
Change-Id: I85daf672cedb8009509886fc6ae2d700d39274cf
2015-12-22 13:01:40 +00:00
Lenka Trochtova
1f28bd5aab Merge "Stop and remove the ephemeral user when it goes to background." 2015-12-22 12:53:16 +00:00
Bart Sears
fb68de3fb1 Merge "Revert "Move Language normalization code from Paint.cpp to Minikin."" 2015-12-22 09:07:08 +00:00
Bart Sears
143f50789e Revert "Move Language normalization code from Paint.cpp to Minikin."
This reverts commit 5640ae00e76f71a35b10b805bbee55efac6b16f2.

Change-Id: If6dfcd74154c3fa49d1fb037ae78fd84f9844591
2015-12-22 09:03:19 +00:00
Daichi Hirono
e442872eaa Merge "Unmount appfuse when the device FD is closed." 2015-12-22 05:31:57 +00:00
Daichi Hirono
91e3b50636 Unmount appfuse when the device FD is closed.
The CL lets MountService to observe device FD, and request unmount to
vold when the device FD was closed, or remote application providing
appfuse is crashed.

BUG=25756420

Change-Id: I7990694d32affa7f89e3f40badb25098d74d744d
2015-12-22 13:41:33 +09:00
Daichi Hirono
bdb5a45f8d Merge "Break while loop when the thread interuppted." 2015-12-22 04:03:27 +00:00
Seigo Nonaka
e824f8287b Merge "Move Language normalization code from Paint.cpp to Minikin." 2015-12-22 04:01:19 +00:00
Daichi Hirono
2bdb388d8f Break while loop when the thread interuppted.
Previously the while loop condition refers to Thread.interrupted()
wrongly. The Thread.interrupted() flag is cleared when the
InterupptedException is thrown.

BUG=26297698

Change-Id: I113d5c88389d54a4a6e29af2cf9515b1693b59dc
2015-12-22 12:57:47 +09:00
Takayuki Hoshi
4df9801e2b Merge "Exclude input devices when finding sinks from audio policy." 2015-12-22 03:05:27 +00:00
Ben Kwa
c1f9e7c487 Merge "Refactor DocumentHolder." 2015-12-21 23:35:39 +00:00
Dimitry Ivanov
c436511e28 Merge "Use shared namespace for bundled app classloader" am: 76a9e55a8f
am: c53d159b3e

* commit 'c53d159b3e2cf96fe1fcf06c66bdb7011b65f46f':
  Use shared namespace for bundled app classloader
2015-12-21 23:33:55 +00:00
Ben Kwa
d839149843 Refactor DocumentHolder.
Primary goals of this refactor are to reduce DirectoryFragment bloat,
and to simplify the code (especially the binding code) for the different
layouts.

- Decouple DocumentHolder from DirectoryFragment.
- Move it into its own file.
- Move binding code from DirectoryFragment into DocumentHolder.
- Split DocumentHolder implementation into three separate subclasses,
  for grid items, list items, and dividers.

BUG=24326989

Change-Id: I217bf4e5b8e1b33173b8b0275591a8c5d8e9161c
2015-12-21 15:31:15 -08:00
Dimitry Ivanov
c53d159b3e Merge "Use shared namespace for bundled app classloader"
am: 76a9e55a8f

* commit '76a9e55a8fd751e747511a9c7d02dddca31964c3':
  Use shared namespace for bundled app classloader
2015-12-21 15:27:57 -08:00
Dimitry Ivanov
76a9e55a8f Merge "Use shared namespace for bundled app classloader" 2015-12-21 23:10:49 +00:00
Robert Carr
cd9a18c7f8 Set SCALING_MODE_NO_SCALE_CROP for SurfaceView.
When resizing SurfaceView along with a main application window,
we want to be able to update the crop of the SurfaceView without waiting
for a buffer at a new size. If we fail to do so the SurfaceView may
extend beyond the edge of the host surface.

Bug: 26010823
Change-Id: I3bb52f82c02bb729a2494a3a43b9654d9aae9532
2015-12-21 14:57:52 -08:00
Geoff Mendal
2fd71cc6ee Merge "Import translations. DO NOT MERGE" 2015-12-21 22:54:57 +00:00
Geoff Mendal
0660fe8e26 Import translations. DO NOT MERGE
Change-Id: Ib5a77438d29248558a83c8ea3b546d538ac89587
Auto-generated-cl: translation import
2015-12-21 22:20:47 +01:00
Dmitry Torokhov
365bf06a72 SystemUI: implement bluetooth scan timeout
When we dock with Pixel C keyboard we normally expect to find it, and so
we perform a low latency scan (which uses highest duty cycle). But if
keyboard is not charged or if tablet mode trigger misfires (because
there was a magnetic object in proximity?) we may not find the keyboard
and will continue scanning indefinitely, impacting WiFi performance and
draining battery. To avoid this scenario let's stop scan if we do not
find "our" device in 30 seconds.

Also remove STATE_WAITING_FOR_STATE_PAIRED as it was unused.

Change-Id: I4bf1a9a163d3165eaa5e8f1cc2d2938465d454af
(cherry picked from commit 6c12c3a6538591b5fa6e11cb4f583aa494e0ce5c)
Signed-off-by: David Riley <davidriley@google.com>
2015-12-21 12:37:17 -08:00
Chad Brubaker
3d27be827b Merge "Add hostname aware isCleartextTrafficPermitted" am: a2f2c5c340
am: c642e052f0

* commit 'c642e052f095d42882f46c2667d609136e269069':
  Add hostname aware isCleartextTrafficPermitted
2015-12-21 19:05:01 +00:00
Chad Brubaker
c642e052f0 Merge "Add hostname aware isCleartextTrafficPermitted"
am: a2f2c5c340

* commit 'a2f2c5c340b552b92088966734097845b76ea310':
  Add hostname aware isCleartextTrafficPermitted
2015-12-21 19:01:01 +00:00
Chad Brubaker
a2f2c5c340 Merge "Add hostname aware isCleartextTrafficPermitted" 2015-12-21 18:52:48 +00:00
Pablo Ceballos
5fa4d15d27 Merge "Add GLES32 class and JNI" 2015-12-21 18:42:03 +00:00
Felipe Leme
8464831bf2 Removed duplicated entry added by bad merging skills.
BUG: 26274653
Change-Id: I68c5e95739a57123591daeb3988532badb89046d
2015-12-21 10:08:43 -08:00
Felipe Leme
e3daf13a49 Merge "Handle bugreport screenshots on Shell." 2015-12-21 17:58:22 +00:00
Philip P. Moltmann
bb9f686b40 Allow a print service to specify per printer icons, description and
info-activities

The icon is loaded from the discovery session only when it is displayed
to avoid having to store too many icons in memory.

Also the icons are not maintained in the historical printers. Only if
the printers are available nice icons are shown. A historical printer is
updated with the appropriate properties (including icon) once it becomes
available.

Bug: 24135005
Change-Id: Iec389bab514b024634be8fb5fc8928371cba8740
2015-12-21 09:54:57 -08:00
Felipe Leme
b819f8983f Merge "Added messages for the new "Take bug report" dialog." 2015-12-21 17:49:25 +00:00
Lenka Trochtova
b4484bacf1 Stop and remove the ephemeral user when it goes to background.
BUG: 24883058

Change-Id: I0e15487fafe08234cde5eebfb9f1d7b96fc7f9fe
2015-12-21 18:42:11 +01:00
Filip Gruszczynski
e6ed195615 Remove confusing logging about surface size.
Change-Id: I377cb6dd25c5db9939a6b7f87fef634426d6c2b4
2015-12-21 09:39:09 -08:00
Filip Gruszczynski
3510bd9be5 Merge "Always elevate input method above the input target." 2015-12-21 17:13:45 +00:00
Filip Gruszczynski
8b18f2d6c6 Merge "Prevent NPE in layer assignment, not all windows have a stack." 2015-12-21 17:12:15 +00:00
Filip Gruszczynski
10d98e4d31 Always elevate input method above the input target.
Bug: 26286301
Change-Id: I02dd290c1dbababed26d34a7e61bb4d7bad5e9ac
2015-12-21 08:56:41 -08:00
Felipe Leme
d1e0f12979 Handle bugreport screenshots on Shell.
Currently, the bugreport screenshots are taken by dumpstate and passed to
Shell as a path on BUGREPORT_RECEIVED; this change not only delegates the
screenshot taking to Shell, but also allows user to take more
screenshots while the bugreport is being generated.

As a result of this change, the final ACTION_SEND_MULTIPLE intent might
contain multiple screenshot attachments, all of them named
"screenshot-PREFIX-NUMBER.png", where PREFIX is the bugreport
name (either initial date provided by dumpstate or a name entered by the
user) and NUMBER is the sequential number of the screenshot as taken by
the user.

The screenshot is taken using screencap, which not only is simpler than
using Framework APIs, but also faster and less intrusive. The only
drawback is that it might fail if an OEM is not providing screencap; if
that happens in the field, we'll need to add fallback option to do it
using such APIs.

Prior to this change, all work done on BugreportProgressService was
executed in one single thread (through the ServiceHandler class) but the
code was guarded by unnecessary synchronization. Now there is another
thread (ScreenshotHandler) that will be used just for taking the
screenshot (so it doesn't handle the main thread). Despite the addition
of a new thread, the code was simplified to remove most synchronization
locks, excepted for the areas touched by both threads.

Once this change is submitted, the bugreport service will be changed so
it does not ask dumpstate to take a screenshot.

BUG: 26274653
Change-Id: I1df883e3c0ca6e3e3cad2522a6a99585f71abb75
2015-12-21 08:53:00 -08:00