302884 Commits

Author SHA1 Message Date
Bill Yi
940639f8b3 Import translations. DO NOT MERGE am: 50a1d26ac0 -s ours
am: 5aef5be20b  -s ours

Change-Id: Ic265b2d560bfdd3b2705bd026c4d964f84bacb64
2017-01-12 17:39:08 +00:00
Bill Yi
fcd0a8bd2b Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 57988f49e6 -s ours
am: ae29fff572  -s ours

Change-Id: I560ca020942b2aca573f467307ef36dd77885d36
2017-01-12 17:37:59 +00:00
Bill Yi
0aeae796d7 Import translations. DO NOT MERGE am: 8c90b5ace0 -s ours
am: 349e01836f  -s ours

Change-Id: I253aeb9193b6e9e24b02be1fd09de4fdf3a0bc4d
2017-01-12 17:36:45 +00:00
Andre Eisenbach
de40f47147 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7 am: e81838f7e1
am: efb1bda2d6

Change-Id: I8144d1e2c856304982679c35faa401f0aad5478f
2017-01-12 17:30:55 +00:00
Selim Cinek
41e8e50aae Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev am: c687aa08c1
am: 5736b1689a  -s ours

Change-Id: I2be4e7e3f4b2830953e7f7b11994274c997f0b3e
2017-01-12 17:28:47 +00:00
Selim Cinek
c2b9092dc8 Allowing heads-up notifications now on the lock screen am: ab24dc9f29
am: f6c9c21745  -s ours

Change-Id: I7435ec86716e0beae9e4c429f12e9ab026360577
2017-01-12 17:27:44 +00:00
Selim Cinek
03edc608f1 Introduced the visual stability manager am: add9526b1d
am: 85e481140c  -s ours

Change-Id: I43f51b10146356ce03264f059338d6c1431715ed
2017-01-12 17:26:51 +00:00
Selim Cinek
fa7f04d980 Removing notifications always immediately when swiping them away am: 5e018206e2
am: fabd50de62  -s ours

Change-Id: I75b2f037bd925aa74db0a43a7513275aacdcfea2
2017-01-12 17:25:58 +00:00
Bill Yi
04f8ba7bb7 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 2f9af2aa69  -s ours

Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0
2017-01-12 17:24:45 +00:00
Bill Yi
5aef5be20b Import translations. DO NOT MERGE
am: 50a1d26ac0  -s ours

Change-Id: I3aa3b58828ce0d6363d0491b7b9acfd022db2b25
2017-01-12 17:24:41 +00:00
Mark Salyzyn
22221f6981 Merge "resolve merge conflicts of ec7e2a164c37 to master" 2017-01-12 17:23:01 +00:00
Bill Yi
ae29fff572 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 57988f49e6  -s ours

Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1
2017-01-12 17:22:54 +00:00
Bill Yi
349e01836f Import translations. DO NOT MERGE
am: 8c90b5ace0  -s ours

Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
2017-01-12 17:22:50 +00:00
TreeHugger Robot
49a4330425 Merge "Import translations. DO NOT MERGE" 2017-01-12 17:20:35 +00:00
TreeHugger Robot
df0a2865b3 Merge "Import translations. DO NOT MERGE" 2017-01-12 17:20:09 +00:00
TreeHugger Robot
2f9af2aa69 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-12 17:19:04 +00:00
Jeff Sharkey
e90aacae13 Merge "Fix the build!" 2017-01-12 17:18:24 +00:00
TreeHugger Robot
57988f49e6 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-12 17:17:50 +00:00
Jeff Sharkey
35140ce8d0 Fix the build!
Change-Id: I4200cbd0190b384a94a8b59988c19101b127cbf9
2017-01-12 10:16:27 -07:00
TreeHugger Robot
f0e2f5e8a2 Merge "Import translations. DO NOT MERGE" 2017-01-12 17:14:15 +00:00
Michal Karpinski
4da4a5d0c8 [DPM] Improvements to the network logs batch finalization mechanism
The full batch will still be available to DPC if there were no
network logs pending.
Added some more debug logging to better investigate the issues.

Test: manual for both cases - pending batch was empty and non-empty,
      with locally decreased timeout
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser

Bug: 34245471
Bug: 29748723
Change-Id: Iee229d74d4b0a06025b305a15687f336a0aa337e
2017-01-12 17:10:02 +00:00
TreeHugger Robot
4064710ac8 Merge "Introduce set/getFontVariationSettings." 2017-01-12 16:59:24 +00:00
Jeff Sharkey
0078e1b777 Add support for fallback categories.
When an app doesn't define a category, look for a fallback category
in a hard-coded list.  This change only defines a fallback for a
single package, but device-specific overlays can be used to provide
more detailed fallback lists.

The precidence order is: app manifest > installer hint > fallback

Test: builds, boots, fallback categories work
Bug: 33815939
Change-Id: I1f5ca76fb7e5743a4500c0a1230a754266f34d9e
2017-01-12 09:53:44 -07:00
Jeff Sharkey
9bc89af3f1 Add API for apps to declare their "category".
Upcoming platform features need to cluster apps together into broad
categories to help summarize information to users.  (For example,
when presenting battery, network, and disk usage.)

We are tightly limiting the set of categories to keep them easily
presentable to users when summarizing information.  This feature is
not designed to be a general-purpose taxonomy, nor should it be
allowed to become one.

Older apps may not have defined a category in their manifests, so
allow the installing app to define a category on their behalf.

Test: builds, boots
Bug: 33815939
Change-Id: I785b882ee7c18072ef47d56e0fc19ad72888e1b7
2017-01-12 09:53:44 -07:00
Ben Wagner
eec27d51d2 Use FatVector instead of SkAutoMalloc in VulkanManager.
Skia is looking to make SkAutoMalloc private and will be moving it.
Using FatVector instead will make this code both less dependent on Skia
internals and more performant.

Test: refactoring CL. Existing unit tests still pass.

Change-Id: If9de10059775b75e1ab89078eacede2e20e91299
2017-01-12 11:52:31 -05:00
TreeHugger Robot
cb2c57338b Merge "[DPM] Improvements to the network logs batch finalization mechanism" 2017-01-12 16:52:28 +00:00
Andre Eisenbach
efb1bda2d6 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7
am: e81838f7e1

Change-Id: I62d424e92e10c1604938349e94ae38938557130c
2017-01-12 16:48:15 +00:00
Andre Eisenbach
e81838f7e1 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e
am: 2d0ad3a9e7

Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
2017-01-12 16:44:42 +00:00
Mark Salyzyn
173215d1b2 resolve merge conflicts of ec7e2a164c37 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5
2017-01-12 08:28:30 -08:00
Andre Eisenbach
2d0ad3a9e7 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
am: 0b9a18d21e

Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
2017-01-12 16:27:03 +00:00
Leon Scroggins III
0517766a0e Remove dependence on SkTRegistry
Test: Existing CTS tests for Movie.

SkTRegistry was renamed and moved (with the intent of being private to
Skia) in https://skia-review.googlesource.com/c/6881.

There is only one class registred anyway, so make Movie::DecodeStream
just check GIF manually.

Change-Id: I7fa668cf13c902b49f2848bce4d86ad83020970f
2017-01-12 11:21:02 -05:00
Selim Cinek
5736b1689a Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
am: c687aa08c1

Change-Id: I99ba4164acbb902f8037859fea4654691e834c81
2017-01-12 16:14:47 +00:00
Selim Cinek
f6c9c21745 Allowing heads-up notifications now on the lock screen
am: ab24dc9f29

Change-Id: I7677c513dba5d787e44bdd73b3cc5d9c004305f5
2017-01-12 16:14:34 +00:00
Selim Cinek
85e481140c Introduced the visual stability manager
am: add9526b1d

Change-Id: I4a8ff70995585461d84ce6a4a3976104e7465547
2017-01-12 16:13:47 +00:00
Selim Cinek
fabd50de62 Removing notifications always immediately when swiping them away
am: 5e018206e2

Change-Id: I09f3b3a2f793b10b7c9c39e96b26a89992a1314a
2017-01-12 16:13:00 +00:00
Andrew Scull
e4cefbf4fc Don't save password metrics to disk.
On FBE devices, don't save the metrics to disk but compute them when the
password is first entered and only store them in RAM.

Merged-in: 5daf273b7e3272269c53eda20ce494d0e7a365b5
Bug: 32793550
Change-Id: Icee7f615167761177b224b342970a36c7d90f6ba
2017-01-12 16:01:59 +00:00
Mark Salyzyn
ec7e2a164c Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b am: d1740f0f5b
am: 6dacea63d9

Change-Id: Ife229cc450dbbb5f43941fcd1b08b86f0e41a779
2017-01-12 15:59:48 +00:00
Andre Eisenbach
0b9a18d21e Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" 2017-01-12 15:58:37 +00:00
Andre Eisenbach
8b4838e5e3 Revert "Don't offer the BT sharing option to the user if BT is disallowed."
Causes boot loop issue:

02-15 02:31:59.785   770   770 E System  : Caused by: java.lang.IllegalArgumentException: Unknown component: com.android.bluetooth/com.android.bluetooth.opp.BluetoothOppLauncherActivity
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setEnabledSetting(PackageManagerService.java:18500)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.pm.PackageManagerService.setComponentEnabledSetting(PackageManagerService.java:18461)
02-15 02:31:59.785   770   770 E System  : .at android.app.ApplicationPackageManager.setComponentEnabledSetting(ApplicationPackageManager.java:2129)
02-15 02:31:59.785   770   770 E System  : .at com.android.server.BluetoothManagerService.updateOppLauncherComponentState(BluetoothManagerService.java:2036)



This reverts commit 77fe44ffb6b5d40daf3b127cb36d5111b7618cc1.

Change-Id: Ia079bb2fcc91bb5979a3840ab50b9d9ddda1cf24
2017-01-12 15:57:29 +00:00
Selim Cinek
c687aa08c1 Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
* changes:
  Allowing heads-up notifications now on the lock screen
  Introduced the visual stability manager
  Removing notifications always immediately when swiping them away
2017-01-12 15:55:30 +00:00
Selim Cinek
b2236108ae Fixed a bug where notifications could stay expanded
When expanding and locking the screen, the notification
could be stuck in a userlocked state and therefore look
expanded even on the lock screen.
Another case where this could happen was when there was
a race between locking the screen and collapsing a group.

Merged-In: I4f359d727013ee8c9e4174d2855896ba8d3d1a0b
Change-Id: I4f359d727013ee8c9e4174d2855896ba8d3d1a0b
Test: have group on locked shade, expand, click on middle space during expansion
Bug: 33614507
2017-01-12 15:52:53 +00:00
Mark Salyzyn
6dacea63d9 Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b
am: d1740f0f5b

Change-Id: I78430cd21cf1186ccc2b48ee4ee8a9b07decde5e
2017-01-12 15:46:20 +00:00
Julia Reynolds
7967230de2 Send Snooze callback for Assistant
On selection of a snooze context SnoozeCriterion.

Test: runtest systemui-notification & make cts-verifier
Change-Id: Iaca567100c29295fbbf1d327195a114106909652
2017-01-12 10:40:11 -05:00
Mark Salyzyn
d1740f0f5b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
am: 2225a0640b

Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
2017-01-12 15:32:50 +00:00
Jorim Jaggi
e2c77f9035 Handle content insets for snapshots
Pass information about content insets of a snapshotted task to
SystemUI and use it there to correctly offset the snapshot
when drawing.

Test: Open app, go to recents, make sure app aligns before
and after the animation.
Bug: 31339431
Change-Id: I2ff9bd44534bd8f66b591385da1e1e3aec40b6c5
2017-01-12 16:28:19 +01:00
Jorim Jaggi
a50da607da Always remove starting window in performShow
When going to homescreen and then opening apps quickly again, the
surface was not yet fully destroyed so we never triggered the
codepath to remove the starting window in that case, so it was
lingering around forever.

Test: Open app, press home, reopen app immidiately again, make sure
snapshot starting window is removed.
Bug: 31339431
Change-Id: I946e681e7dc222e3dedfd3edacb8f37aee4a198b
2017-01-12 16:28:08 +01:00
Jorim Jaggi
02886a82d8 Initial implementation of snapshots
All this functionality is hidden behind a flag. If this flag is
active, we disable the regular screenshots.

Instead, we take a screenshot when an app transition for which a
task is disappearing is starting. The screenshot gets stored
into a gralloc buffer. SystemUI uses a new method to retrieve
a snapshot gralloc buffer and then draws it using GraphicBuffer.
createHardwareBitmap().

When starting an existing activity in an existing tasks, or when
bringing an existing tasks to front from recents, we add a new
snapshot starting window. For that, we reuse the existing
starting window, but when creating the window, we use a fake
window that draws the contents of the starting window.

Test: runtest frameworks-services -c
com.android.server.wm.TaskSnapshotControllerTest
Bug: 31339431
Change-Id: If72df07b3e56f30413db5029d0887b8c9665aaf4
2017-01-12 16:28:01 +01:00
Mark Salyzyn
2225a0640b Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" 2017-01-12 15:18:26 +00:00
Jerome Gaillard
7a1cab2c96 Update layoutlib following Change Id10ca97f on FontFamily
Test: layoutlib tests

Change-Id: Ic8872a43993bcb0a157c5e3f0ce423af9b47f606
2017-01-12 15:06:46 +00:00
Michal Karpinski
3dcd39c14a [DPM] Improvements to the network logs batch finalization mechanism
The full batch will still be available to DPC if there were no
network logs pending.
Added some more debug logging to better investigate the issues.

Test: manual for both cases - pending batch was empty and non-empty,
      with locally decreased timeout
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser

Bug: 34157435
Bug: 29748723
Change-Id: Iee229d74d4b0a06025b305a15687f336a0aa337e
2017-01-12 15:05:12 +00:00