OSDN Git Service
Andrew Rossignol [Thu, 12 Jan 2017 19:08:24 +0000 (19:08 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev am:
c65a010a39 -s ours
am:
6ebc52a950 -s ours
Change-Id: I1ae4fb72bc6a5576dfb3894f8b24e529cd52e0a6
Andrew Rossignol [Thu, 12 Jan 2017 19:07:25 +0000 (19:07 +0000)]
Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black" am:
57edeef91a -s ours
am:
4fa95e7bbb -s ours
Change-Id: If522327abdedb779d2a60be7dafa08701bfde0ac
Jiaquan He [Thu, 12 Jan 2017 19:03:27 +0000 (19:03 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev am:
5c4c5e1682
am:
97b832a438
Change-Id: I14cfb594bbeecbcd8b86ea0b6931891ed93b82cb
Jiaquan He [Thu, 12 Jan 2017 19:02:18 +0000 (19:02 +0000)]
2D Recents: Show shadows behind task views. am:
15fa3246d8
am:
0cb857822e
Change-Id: Ice75a09a845ed8639c11053a3428f0b01fc40ded
Andrew Rossignol [Thu, 12 Jan 2017 18:59:56 +0000 (18:59 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
am:
c65a010a39 -s ours
Change-Id: I39efaeb589830e7d448e208d37a079c798477224
Andrew Rossignol [Thu, 12 Jan 2017 18:59:51 +0000 (18:59 +0000)]
Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"
am:
57edeef91a -s ours
Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
Shukang Zhou [Thu, 12 Jan 2017 18:59:26 +0000 (18:59 +0000)]
Merge "Close a file descriptor before losing its reference."
Jiaquan He [Thu, 12 Jan 2017 18:56:34 +0000 (18:56 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
am:
5c4c5e1682
Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
Jiaquan He [Thu, 12 Jan 2017 18:56:27 +0000 (18:56 +0000)]
2D Recents: Show shadows behind task views.
am:
15fa3246d8
Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
TreeHugger Robot [Thu, 12 Jan 2017 18:52:38 +0000 (18:52 +0000)]
Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
Jiaquan He [Thu, 12 Jan 2017 18:50:06 +0000 (18:50 +0000)]
Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
Selim Cinek [Thu, 12 Jan 2017 18:48:04 +0000 (18:48 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev am:
c1c7d1f938
am:
8b36bbf0ea -s ours
Change-Id: I8b7cba700a76670ce67ec8e3fe377fd16f7df78d
Selim Cinek [Thu, 12 Jan 2017 18:46:57 +0000 (18:46 +0000)]
Fixed a bug where notifications could stay expanded am:
b2236108ae
am:
97f14c47db -s ours
Change-Id: I8871b9f79245de04271894a6e2e508b1c55280de
Selim Cinek [Thu, 12 Jan 2017 18:42:41 +0000 (18:42 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
am:
c1c7d1f938
Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
Selim Cinek [Thu, 12 Jan 2017 18:42:32 +0000 (18:42 +0000)]
Fixed a bug where notifications could stay expanded
am:
b2236108ae
Change-Id: I9c776321f0865f6971692008256cd80adbab5469
Ben Wagner [Thu, 12 Jan 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Use FatVector instead of SkAutoMalloc in VulkanManager."
Selim Cinek [Thu, 12 Jan 2017 18:37:04 +0000 (18:37 +0000)]
Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
Winson Chung [Thu, 12 Jan 2017 18:17:32 +0000 (18:17 +0000)]
Merge "Replacing removed string."
Android Build Merger (Role) [Thu, 12 Jan 2017 17:41:09 +0000 (17:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
2f9af2aa69 -s ours am:
04f8ba7bb7 -s ours"
Bill Yi [Thu, 12 Jan 2017 17:40:23 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
2f9af2aa69 -s ours
am:
04f8ba7bb7 -s ours
Change-Id: I4f4317d788bff53bf621b06a6e01498f8497253a
Android Build Merger (Role) [Thu, 12 Jan 2017 17:40:04 +0000 (17:40 +0000)]
Merge "Import translations. DO NOT MERGE am:
50a1d26ac0 -s ours am:
5aef5be20b -s ours"
TreeHugger Robot [Thu, 12 Jan 2017 17:39:11 +0000 (17:39 +0000)]
Merge changes I2ff9bd44,I946e681e,If72df07b
* changes:
Handle content insets for snapshots
Always remove starting window in performShow
Initial implementation of snapshots
Bill Yi [Thu, 12 Jan 2017 17:39:08 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE am:
50a1d26ac0 -s ours
am:
5aef5be20b -s ours
Change-Id: Ic265b2d560bfdd3b2705bd026c4d964f84bacb64
Bill Yi [Thu, 12 Jan 2017 17:37:59 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
57988f49e6 -s ours
am:
ae29fff572 -s ours
Change-Id: I560ca020942b2aca573f467307ef36dd77885d36
Bill Yi [Thu, 12 Jan 2017 17:36:45 +0000 (17:36 +0000)]
Import translations. DO NOT MERGE am:
8c90b5ace0 -s ours
am:
349e01836f -s ours
Change-Id: I253aeb9193b6e9e24b02be1fd09de4fdf3a0bc4d
Andre Eisenbach [Thu, 12 Jan 2017 17:30:55 +0000 (17:30 +0000)]
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
Selim Cinek [Thu, 12 Jan 2017 17:28:47 +0000 (17:28 +0000)]
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev am:
c687aa08c1
am:
5736b1689a -s ours
Change-Id: I2be4e7e3f4b2830953e7f7b11994274c997f0b3e
Selim Cinek [Thu, 12 Jan 2017 17:27:44 +0000 (17:27 +0000)]
Allowing heads-up notifications now on the lock screen am:
ab24dc9f29
am:
f6c9c21745 -s ours
Change-Id: I7435ec86716e0beae9e4c429f12e9ab026360577
Selim Cinek [Thu, 12 Jan 2017 17:26:51 +0000 (17:26 +0000)]
Introduced the visual stability manager am:
add9526b1d
am:
85e481140c -s ours
Change-Id: I43f51b10146356ce03264f059338d6c1431715ed
Selim Cinek [Thu, 12 Jan 2017 17:25:58 +0000 (17:25 +0000)]
Removing notifications always immediately when swiping them away am:
5e018206e2
am:
fabd50de62 -s ours
Change-Id: I75b2f037bd925aa74db0a43a7513275aacdcfea2
Bill Yi [Thu, 12 Jan 2017 17:24:45 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
2f9af2aa69 -s ours
Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0
Bill Yi [Thu, 12 Jan 2017 17:24:41 +0000 (17:24 +0000)]
Import translations. DO NOT MERGE
am:
50a1d26ac0 -s ours
Change-Id: I3aa3b58828ce0d6363d0491b7b9acfd022db2b25
Mark Salyzyn [Thu, 12 Jan 2017 17:22:56 +0000 (17:22 +0000)]
Merge "resolve merge conflicts of
ec7e2a164c37 to master"
Bill Yi [Thu, 12 Jan 2017 17:22:54 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
57988f49e6 -s ours
Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1
Bill Yi [Thu, 12 Jan 2017 17:22:50 +0000 (17:22 +0000)]
Import translations. DO NOT MERGE
am:
8c90b5ace0 -s ours
Change-Id: I8f1eb0d40376248db07c790386db738fa36220ae
TreeHugger Robot [Thu, 12 Jan 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 17:20:05 +0000 (17:20 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 17:19:00 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Jeff Sharkey [Thu, 12 Jan 2017 17:18:19 +0000 (17:18 +0000)]
Merge "Fix the build!"
TreeHugger Robot [Thu, 12 Jan 2017 17:17:46 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Jeff Sharkey [Thu, 12 Jan 2017 17:16:27 +0000 (10:16 -0700)]
Fix the build!
Change-Id: I4200cbd0190b384a94a8b59988c19101b127cbf9
TreeHugger Robot [Thu, 12 Jan 2017 17:14:10 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 12 Jan 2017 16:59:20 +0000 (16:59 +0000)]
Merge "Introduce set/getFontVariationSettings."
Jeff Sharkey [Wed, 11 Jan 2017 23:05:27 +0000 (16:05 -0700)]
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
Jeff Sharkey [Wed, 11 Jan 2017 18:25:50 +0000 (11:25 -0700)]
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
Ben Wagner [Wed, 11 Jan 2017 20:32:07 +0000 (15:32 -0500)]
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
TreeHugger Robot [Thu, 12 Jan 2017 16:52:23 +0000 (16:52 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism"
Andre Eisenbach [Thu, 12 Jan 2017 16:48:15 +0000 (16:48 +0000)]
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
Andre Eisenbach [Thu, 12 Jan 2017 16:44:42 +0000 (16:44 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am:
0b9a18d21e
am:
2d0ad3a9e7
Change-Id: I9ba589e7b46bf48374b30975ccc9fedb6d740b01
Mark Salyzyn [Thu, 12 Jan 2017 16:27:11 +0000 (08:27 -0800)]
resolve merge conflicts of
ec7e2a164c37 to master
Test: compile
Bug:
26552300
Bug:
31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5
Andre Eisenbach [Thu, 12 Jan 2017 16:27:03 +0000 (16:27 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
am:
0b9a18d21e
Change-Id: I245966c53c49da6c0b95b73ec72754d85edcd627
Selim Cinek [Thu, 12 Jan 2017 16:14:47 +0000 (16:14 +0000)]
Merge changes I1d04a92e,I8d7596fa,If63c5434 into nyc-mr2-dev
am:
c687aa08c1
Change-Id: I99ba4164acbb902f8037859fea4654691e834c81
Selim Cinek [Thu, 12 Jan 2017 16:14:34 +0000 (16:14 +0000)]
Allowing heads-up notifications now on the lock screen
am:
ab24dc9f29
Change-Id: I7677c513dba5d787e44bdd73b3cc5d9c004305f5
Selim Cinek [Thu, 12 Jan 2017 16:13:47 +0000 (16:13 +0000)]
Introduced the visual stability manager
am:
add9526b1d
Change-Id: I4a8ff70995585461d84ce6a4a3976104e7465547
Selim Cinek [Thu, 12 Jan 2017 16:13:00 +0000 (16:13 +0000)]
Removing notifications always immediately when swiping them away
am:
5e018206e2
Change-Id: I09f3b3a2f793b10b7c9c39e96b26a89992a1314a
Mark Salyzyn [Thu, 12 Jan 2017 15:59:48 +0000 (15:59 +0000)]
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
Andre Eisenbach [Thu, 12 Jan 2017 15:58:36 +0000 (15:58 +0000)]
Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed.""
Andre Eisenbach [Thu, 12 Jan 2017 15:56:39 +0000 (15:56 +0000)]
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
Selim Cinek [Thu, 12 Jan 2017 15:55:26 +0000 (15:55 +0000)]
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
Selim Cinek [Thu, 22 Dec 2016 15:39:54 +0000 (16:39 +0100)]
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
Mark Salyzyn [Thu, 12 Jan 2017 15:46:20 +0000 (15:46 +0000)]
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
Mark Salyzyn [Thu, 12 Jan 2017 15:32:50 +0000 (15:32 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
am:
2225a0640b
Change-Id: I2302614d240f276a9c974f5e94bc0bbdb2585966
Jorim Jaggi [Thu, 29 Dec 2016 13:57:22 +0000 (14:57 +0100)]
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
Jorim Jaggi [Thu, 29 Dec 2016 10:51:42 +0000 (11:51 +0100)]
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
Jorim Jaggi [Tue, 6 Dec 2016 17:10:06 +0000 (09:10 -0800)]
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
Mark Salyzyn [Thu, 12 Jan 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)"
Michal Karpinski [Thu, 12 Jan 2017 14:45:01 +0000 (14:45 +0000)]
[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
TreeHugger Robot [Thu, 12 Jan 2017 15:01:49 +0000 (15:01 +0000)]
Merge "Fix NPE when trying to add starting window"
TreeHugger Robot [Thu, 12 Jan 2017 14:01:22 +0000 (14:01 +0000)]
Merge "Remove PO support from HardwarePropertiesManager"
TreeHugger Robot [Thu, 12 Jan 2017 13:46:05 +0000 (13:46 +0000)]
Merge "[DPM] Allow lower strong auth timeout on debuggable builds"
Jorim Jaggi [Thu, 12 Jan 2017 12:54:40 +0000 (13:54 +0100)]
Fix NPE when trying to add starting window
Container may already have been removed, so protect against that
situation.
Test: Boot device
Change-Id: Ic76d74c6df0801e2a50352a4b04d67b5d216d4fe
Fixes:
34227241
Bill Yi [Thu, 12 Jan 2017 13:23:03 +0000 (05:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6daeaa7d995e86318f60d1bb0e1094f9bcdd9709
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:44:11 +0000 (11:44 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a am:
3556fd53a2 am:
95322ffdde
am:
4103219402
Change-Id: Iadadfa8f8be5539fffa27c89ab7ebb74ada694e4
Bill Yi [Thu, 12 Jan 2017 11:41:01 +0000 (03:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6119a209e99f4e301961a07b18b181b8069cfd3e
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:39:05 +0000 (11:39 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a am:
3556fd53a2
am:
95322ffdde
Change-Id: Ibc624034478689ad1208e5da15835a6acd2d796a
Michal Karpinski [Wed, 14 Dec 2016 13:47:37 +0000 (13:47 +0000)]
[DPM] Allow lower strong auth timeout on debuggable builds
Timeout can be set to lower than 1h on debuggable builds (eng, user-debug)
using persist.sys.min_str_auth_timeo system property. This allows manual
testers to more easily carry out testing scenarios.
Bug:
29825955
Test: manual without setting the property: if timeout is set to less than 1h, it's clamped to 1h
Test: manual with setting the property: on user-debug build with "adb root && adb shell setprop persist.sys.min_str_auth_timeo 30000"
Change-Id: I8cd871e3d04b2c6c7164f684b9a6a24e7292bfab
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:33:15 +0000 (11:33 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d" am:
c0d71fa38a
am:
3556fd53a2
Change-Id: Idd321bad02683a94425fb2b6302f3f7621b6844f
Bill Yi [Thu, 12 Jan 2017 11:29:23 +0000 (03:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib976549750fe35328391038a3f7bf3e3e7f6f13b
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 11:27:32 +0000 (11:27 +0000)]
Merge "Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d"
am:
c0d71fa38a
Change-Id: I43d1e2241bfcb1dde53390e21c94c44054375901
Treehugger Robot [Thu, 12 Jan 2017 11:20:05 +0000 (11:20 +0000)]
TreeHugger Robot [Thu, 12 Jan 2017 11:13:33 +0000 (11:13 +0000)]
Merge "Modify WifiNetworkScoreCache to print full Score."
Pavel Grafov [Thu, 12 Jan 2017 11:11:57 +0000 (11:11 +0000)]
Merge "Let profile owners also receive OTA notification."
Pavel Grafov [Thu, 12 Jan 2017 11:08:50 +0000 (11:08 +0000)]
Merge "Fix DevicePolicyManagerServiceMigrationTest."
Erik Kline [Thu, 12 Jan 2017 10:49:31 +0000 (10:49 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b am:
cbd3d8b356 am:
082263344a
am:
190d8591ce
Change-Id: I255691753279b370e85c4bde1930b7e2f45cd109
Martijn Coenen [Thu, 12 Jan 2017 10:44:38 +0000 (10:44 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb am:
aa4d6f1be9 am:
eed50c1809
am:
cfc4e21899
Change-Id: I0478ca20b670f7ddd776ea98f3d5d1db928842ac
Erik Kline [Thu, 12 Jan 2017 10:43:26 +0000 (10:43 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b am:
cbd3d8b356
am:
082263344a
Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a
Bill Yi [Thu, 12 Jan 2017 10:41:59 +0000 (02:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id49c8f367fafd803a9ce3f2f7fbd8c5b9c6dc7bc
Auto-generated-cl: translation import
Martijn Coenen [Thu, 12 Jan 2017 10:38:28 +0000 (10:38 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb am:
aa4d6f1be9
am:
eed50c1809
Change-Id: Ia89700ddb0300b931e11b3f4dc5f31c4234d7076
Erik Kline [Thu, 12 Jan 2017 10:33:24 +0000 (10:33 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling" am:
f9f5cf9d9b
am:
cbd3d8b356
Change-Id: I845443ae243429847e0a42b3be5bec6276a216c0
Martijn Coenen [Thu, 12 Jan 2017 10:31:35 +0000 (10:31 +0000)]
Merge "Use new read(Embedded)Buffer APIs." am:
34ed84d4eb
am:
aa4d6f1be9
Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
Erik Kline [Thu, 12 Jan 2017 10:26:43 +0000 (10:26 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
am:
f9f5cf9d9b
Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
Martijn Coenen [Thu, 12 Jan 2017 10:25:01 +0000 (10:25 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
am:
34ed84d4eb
Change-Id: Idaa3a3a2d874b10cb5f07e3cb606c822e7ddfd8b
Treehugger Robot [Thu, 12 Jan 2017 10:18:24 +0000 (10:18 +0000)]
Merge "Simplify UpstreamNetworkMonitor callback handling"
Treehugger Robot [Thu, 12 Jan 2017 10:17:38 +0000 (10:17 +0000)]
Merge "Use new read(Embedded)Buffer APIs."
Bill Yi [Thu, 12 Jan 2017 10:10:06 +0000 (02:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1a0905f0339bd6d14aecff9491cf17453a4f90ed
Auto-generated-cl: translation import
Sundeep Ghuman [Thu, 12 Jan 2017 00:54:08 +0000 (16:54 -0800)]
Modify WifiNetworkScoreCache to print full Score.
Test: dumped network_score and verified printout
Change-Id: I3689449db91e8c5e96bed349749f074c5626bd03
Przemyslaw Szczepaniak [Thu, 12 Jan 2017 09:40:47 +0000 (09:40 +0000)]
Track libcore change
69860bf2b28f0e14741a8895abdb77b45d1ed55d
java.util.regex named group capture support.
Test: vogar OldMatcherTest
Bug:
19717812
Change-Id: I525489bc26083b22bb2ce670d614f6d6e6eeaa29
Seigo Nonaka [Wed, 30 Nov 2016 22:04:21 +0000 (14:04 -0800)]
Introduce set/getFontVariationSettings.
This CL enables developers to specify axis values to the underlying
font collection. The specification of the font variation settings is
the same as the CSS font-variation-settings attribute in CSS working
draft as of 2016-11-30.
Code example: Here is an example to set width 100 and weight 1.5.
TextView tv = (TextView) findViewById(R.id.textView);
tv.setFontVariationSettings("'wdth' 100, 'wght' 1.5");
Bug:
33062398
Test: Manually done. Ran FrameworksGraphicsTests, CtsGraphicsTestCases
and CtsWidgetTestCases
Change-Id: I249d464f8cdaa56017a987588b94ed685aadeb58
Hugo Benichi [Thu, 12 Jan 2017 09:06:28 +0000 (09:06 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev am:
c45082266f
am:
f32a9f72d0
Change-Id: I62c0ab068b1304a1dbe7edbae29e5e74d8c34e08
Hugo Benichi [Thu, 12 Jan 2017 09:05:25 +0000 (09:05 +0000)]
Captive portal: better detect empty responses am:
cb4aa4d412
am:
3d5357ba2d
Change-Id: I3982ce4485d94c4abcf6afb2c58aa94a2ff2c902