OSDN Git Service
Manu Cornet [Fri, 13 Jan 2017 19:58:42 +0000 (19:58 +0000)]
Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
am:
a4d01c8573
Change-Id: I240109d6f400bc29e398b2cf07b238b9b17713f3
Manu Cornet [Fri, 13 Jan 2017 19:58:35 +0000 (19:58 +0000)]
DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
am:
569cbecd92
Change-Id: I4da39588dd8ba6f750cbedbe3abb9ebce1dd8080
TreeHugger Robot [Fri, 13 Jan 2017 19:54:18 +0000 (19:54 +0000)]
Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
Michal Karpinski [Fri, 13 Jan 2017 09:51:32 +0000 (09:51 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
am:
54b7388163
Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
Michal Karpinski [Fri, 13 Jan 2017 09:51:27 +0000 (09:51 +0000)]
[DPM] Improvements to the network logs batch finalization mechanism
am:
4da4a5d0c8
Change-Id: I6318392173aeb2653734537569d03158799a099c
Michal Karpinski [Fri, 13 Jan 2017 09:47:21 +0000 (09:47 +0000)]
Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
Manu Cornet [Fri, 13 Jan 2017 02:36:06 +0000 (02:36 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
am:
2660111259
Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
Manu Cornet [Fri, 13 Jan 2017 02:36:02 +0000 (02:36 +0000)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
am:
da5900d0a7
Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
TreeHugger Robot [Fri, 13 Jan 2017 02:31:08 +0000 (02:31 +0000)]
Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
Manu Cornet [Wed, 11 Jan 2017 20:32:54 +0000 (12:32 -0800)]
DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
Bug:
32101881
Test: Checked layout in various situations when switching orientation
Change-Id: Iae1f142f6568890512e24787d78cfb1e15280feb
Manu Cornet [Thu, 12 Jan 2017 23:05:13 +0000 (15:05 -0800)]
DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
Bug:
32101881
Test: Checked the effect on app -> recents transition on local sw600dp device
Change-Id: Ic3e3af6e8db4a62028e1283e915a7cd12db49607
Manu Cornet [Fri, 13 Jan 2017 00:28:26 +0000 (00:28 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
am:
5ee87b5b6a
Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
Manu Cornet [Fri, 13 Jan 2017 00:28:19 +0000 (00:28 +0000)]
2D Recents: Use a different task dismiss animation
am:
5df7667edb
Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
Manu Cornet [Fri, 13 Jan 2017 00:23:44 +0000 (00:23 +0000)]
Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
Robert Greenwalt [Thu, 12 Jan 2017 23:20:45 +0000 (23:20 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641 am:
24dea10375
am:
503d8fbb26
Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
Robert Greenwalt [Thu, 12 Jan 2017 23:16:20 +0000 (23:16 +0000)]
Merge "Add support for FDN contact dial" am:
082b118641
am:
24dea10375
Change-Id: I5091d35ff79eff952c57109ce120369c95309598
Robert Greenwalt [Thu, 12 Jan 2017 23:12:23 +0000 (23:12 +0000)]
Merge "Add support for FDN contact dial"
am:
082b118641
Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
Robert Greenwalt [Thu, 12 Jan 2017 23:06:59 +0000 (23:06 +0000)]
Merge "Add support for FDN contact dial"
Andrew Sapperstein [Thu, 12 Jan 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev
am:
1f2769189d
Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
Chris Wren [Thu, 12 Jan 2017 21:23:11 +0000 (21:23 +0000)]
Create a global registry for system message IDs
am:
117d5b4f28
Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
Andrew Sapperstein [Thu, 12 Jan 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Create a global registry for system message IDs" into nyc-mr2-dev
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
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: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
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
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
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:19:00 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 12 Jan 2017 17:17:46 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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:
34245471
Bug:
29748723
Change-Id: Iee229d74d4b0a06025b305a15687f336a0aa337e
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
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
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)"
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
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)]
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
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."
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
Hugo Benichi [Thu, 12 Jan 2017 08:59:33 +0000 (08:59 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev
am:
c45082266f
Change-Id: Ice8b5df87baf475ebc4eb8f2eb4fe0150c938639
Hugo Benichi [Thu, 12 Jan 2017 08:59:27 +0000 (08:59 +0000)]
Captive portal: better detect empty responses
am:
cb4aa4d412
Change-Id: I64a006f6bb83dc588b108395d54189bb401c83ff
TreeHugger Robot [Thu, 12 Jan 2017 08:51:31 +0000 (08:51 +0000)]
Merge "Captive portal: better detect empty responses" into nyc-mr2-dev
Stephen Chen [Thu, 12 Jan 2017 07:33:19 +0000 (07:33 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366 am:
0e7882f2ac
am:
272e70bf69
Change-Id: I2bc76076e613566111404c55faefaeda9048f2d1
Stephen Chen [Thu, 12 Jan 2017 07:27:22 +0000 (07:27 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi" am:
691ebe5366
am:
0e7882f2ac
Change-Id: I7408b253a7acc4aaf22dc7748b1941576d5de4c7
Stephen Chen [Thu, 12 Jan 2017 07:21:49 +0000 (07:21 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
am:
691ebe5366
Change-Id: I114cbc6777130b440639b2f13e161d8d044f7185
Treehugger Robot [Thu, 12 Jan 2017 07:15:05 +0000 (07:15 +0000)]
Merge "Expose WifiManager#connect and ActionListener as @SystemApi"
Hugo Benichi [Wed, 11 Jan 2017 07:23:26 +0000 (16:23 +0900)]
Captive portal: better detect empty responses
The captive portal detection logic treats empty http responses with a
Content-Length of 0 as not coming from a portal.
However when the Content-Length is missing from the response header, the
empty response is not detected as such and is classified as a captive
portal answer.
When this happens for the http probe, the portal detection logic will
short circuit the detection and wrongly report a portal. The system
validates the network in such conditions only if the https probe
returns a successful connection faster than the http probe.
This patch attempts to better detect empty responses by trying to read
the first byte from the response body when the Content-Length is missing
for 200 responses.
Test: build, flashed + manual tests.
Bug:
33498325
Change-Id: Ie2e5c6a9dc3740e4a2304034879b5ed60f277ade
Stephen Chen [Fri, 6 Jan 2017 23:34:28 +0000 (15:34 -0800)]
Expose WifiManager#connect and ActionListener as @SystemApi
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.
Bug:
33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
Merged-In: If4f1f9957f82b1292af4187c7728cbccab0184e8
Colin Cross [Thu, 12 Jan 2017 05:11:47 +0000 (05:11 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad am:
301c714b43
am:
dcb0c55c15
Change-Id: I55f8fed5eff824e792cbfc29b7cd7b496cad106c
Colin Cross [Thu, 12 Jan 2017 05:05:41 +0000 (05:05 +0000)]
Merge "Remove libservicestestsjni" am:
d00478e9ad
am:
301c714b43
Change-Id: I08e2298e7dd1ba8729e6d4a03e3c940012bb5e12
Colin Cross [Thu, 12 Jan 2017 04:59:42 +0000 (04:59 +0000)]
Merge "Remove libservicestestsjni"
am:
d00478e9ad
Change-Id: I062f8bd18730a8c3ee090fc4665f652fe10ff75c
Treehugger Robot [Thu, 12 Jan 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Remove libservicestestsjni"
Erik Kline [Wed, 11 Jan 2017 08:34:50 +0000 (17:34 +0900)]
Simplify UpstreamNetworkMonitor callback handling
In the callback post a lamba to the target state machine's handler
that does the processing we need before sending a notification to
the state machine.
No semantic change, just a bit cleaner.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- tested basic wifi-to-mobile tethering (no DUN)
Bug:
32163131
Change-Id: I07e1b510c1ebaa5dffd42a3f16ba96e961cb58f1
Colin Cross [Wed, 11 Jan 2017 22:29:10 +0000 (14:29 -0800)]
Remove libservicestestsjni
frameworks/base/services/tests/servicestests/jni no longer exists
after I993eeaa5dec001c39389023f355f506129b356e7, remove it.
Test: m -j FrameworksServicesTests
Change-Id: I8f307373aede9e749f1b992dde0f7252bf74b065
(cherry-picked from
e399468b88ae84a586f9d583251ee0a6a7e94a43)
Merged-In: I8f307373aede9e749f1b992dde0f7252bf74b065
Android Build Merger (Role) [Thu, 12 Jan 2017 03:13:04 +0000 (03:13 +0000)]
Merge "Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8 am:
ae21066a59" into nyc-mr2-dev-plus-aosp
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8
am:
699e7878ef
Change-Id: I39aefb9af40cbe6a2cc833bf4e5e96890c0b13a4
Shijian Li [Thu, 12 Jan 2017 03:12:17 +0000 (03:12 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now. am:
5e7fc7ccc8
am:
ae21066a59
Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc
Shijian Li [Thu, 12 Jan 2017 03:07:23 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I327673625deafc5c18319ce1b61734a090b6a989
Shijian Li [Thu, 12 Jan 2017 03:07:10 +0000 (03:07 +0000)]
Sync the startConsentUiIfNeeded logics to We are missing the package name when starting the activity now.
am:
5e7fc7ccc8
Change-Id: I4214dc072d3155cd417ee3577918570e515fa1cf
Yifan Hong [Thu, 12 Jan 2017 02:14:00 +0000 (02:14 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15 am:
e0707f139d
am:
860ef8810d
Change-Id: I60bdcdd36defa739e346481aa3f3a46ac90ccf32
Yifan Hong [Thu, 12 Jan 2017 02:08:36 +0000 (02:08 +0000)]
Merge "BpBase -> BpHwBase" am:
d8384b5c15
am:
e0707f139d
Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
Yifan Hong [Thu, 12 Jan 2017 01:58:33 +0000 (01:58 +0000)]
Merge "BpBase -> BpHwBase"
am:
d8384b5c15
Change-Id: I647e8ec4461e4d9c859144c123f278216111a2f4
Treehugger Robot [Thu, 12 Jan 2017 01:50:57 +0000 (01:50 +0000)]
Merge "BpBase -> BpHwBase"
Selim Cinek [Wed, 21 Dec 2016 17:23:11 +0000 (18:23 +0100)]
Allowing heads-up notifications now on the lock screen
In order to isolate notifications properly from their group
and in order to allow them to visually reorder, we now allow
heads up notifications on the lock screen.
Merged-In: I1d04a92e66ae92ecee4f8ee23b218c2b167dadd4
Change-Id: I1d04a92e66ae92ecee4f8ee23b218c2b167dadd4
Test: existing tests pass
Test: add heads up on lockscreen
Test: heads up group child on lockscreen
Bug:
33773401
Selim Cinek [Tue, 6 Dec 2016 22:34:47 +0000 (14:34 -0800)]
Introduced the visual stability manager
Notifications used to roam around and reorder whenever
they wished. Those little beasts must be tamed, hence
a new visual stability manager is introduced that
dictates the terms of their interplay.
Test: manual: add heads-up and see if they correctly appear
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/notification/VisualStabilityManagerTest.java
Bug:
33773401
Merged-In: I8d7596fa7c14e0df68459a77d445f618d517ad51
Change-Id: I8d7596fa7c14e0df68459a77d445f618d517ad51
Selim Cinek [Thu, 15 Dec 2016 22:44:36 +0000 (14:44 -0800)]
Removing notifications always immediately when swiping them away
When swiping away notifications we were previously relying on the
notification manager to cancel the notification for us. If the state
diverges however (due to bugs) this leads to unrecoverable empty
holes which is super bad.
Merged-In: If63c5434b4e438fea560e0013a12c60655103977
Change-Id: If63c5434b4e438fea560e0013a12c60655103977
Test: existing tests pass
Bug:
33457118
Tim Murray [Thu, 12 Jan 2017 00:32:01 +0000 (00:32 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
am:
0b7b79a882
Change-Id: I669aa5012a93c70b7ee7af7c1958159d933b4f4c
Tim Murray [Thu, 12 Jan 2017 00:31:54 +0000 (00:31 +0000)]
add additional logging to ActiityManagerService
am:
82e201f03d
Change-Id: I0ea737adc3f59674a0ce313a0a8caa49d926e359
Tim Murray [Thu, 12 Jan 2017 00:24:27 +0000 (00:24 +0000)]
Merge "add additional logging to ActiityManagerService" into nyc-mr2-dev
Jiaquan He [Thu, 5 Jan 2017 22:34:44 +0000 (14:34 -0800)]
2D Recents: Show shadows behind task views.
Test: Checked that there's a shadow behind each task view in Grid-based
Recents on local sw600dp device.
Bug:
32101881
Change-Id: I2cb2c0f73cbe23c4dcce5a4839965fdff13a0df5
Mark Salyzyn [Wed, 28 Sep 2016 23:15:30 +0000 (16:15 -0700)]
Replace cutils/log.h and log/logger.h with android/log.h or log/log.h
(part deux)
Test: compile
Bug:
26552300
Bug:
31289077
Change-Id: I7417936c4d3666608fccfe51a312c90ecefba2fb
Etan Cohen [Wed, 11 Jan 2017 23:22:51 +0000 (23:22 +0000)]
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am:
dfe8f5dc13 am:
2a4e3bef2c
am:
b32dfa4ef5
Change-Id: If2a6b632cd03984921572b190745865953a8e808
OSDN Git Service
