Commit Graph

281399 Commits

Author SHA1 Message Date
Andrew Sapperstein
ace5aea996 Merge "Add logging for high temp warning." into nyc-mr2-dev
am: 409d93356c

Change-Id: I83cef78c03fbbbe1e8e66f2215ca9d7be2095047
2017-01-13 20:28:40 +00:00
Andrew Sapperstein
990826a0a1 Add logging for high temp warning.
am: 6c08f8da09

Change-Id: Id567e12b8eb6b85ab49ace003c03b80759073687
2017-01-13 20:28:35 +00:00
TreeHugger Robot
409d93356c Merge "Add logging for high temp warning." into nyc-mr2-dev 2017-01-13 20:24:50 +00:00
Manu Cornet
07ed38cddc Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev
am: a4d01c8573

Change-Id: I240109d6f400bc29e398b2cf07b238b9b17713f3
2017-01-13 19:58:42 +00:00
Manu Cornet
548ff6209c DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations
am: 569cbecd92

Change-Id: I4da39588dd8ba6f750cbedbe3abb9ebce1dd8080
2017-01-13 19:58:35 +00:00
TreeHugger Robot
a4d01c8573 Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 2017-01-13 19:54:20 +00:00
Michal Karpinski
3f0307c050 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev
am: 54b7388163

Change-Id: Ie5adab88fba61adc5b47ab3cd91bcb4dcade09cd
2017-01-13 09:51:32 +00:00
Michal Karpinski
f27cc410dd [DPM] Improvements to the network logs batch finalization mechanism
am: 4da4a5d0c8

Change-Id: I6318392173aeb2653734537569d03158799a099c
2017-01-13 09:51:27 +00:00
Michal Karpinski
54b7388163 Merge "[DPM] Improvements to the network logs batch finalization mechanism" into nyc-mr2-dev 2017-01-13 09:47:24 +00:00
Manu Cornet
4c7317373c Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev
am: 2660111259

Change-Id: If5b4cfd5f8a84060a90b457351638bbd7b2d526b
2017-01-13 02:36:06 +00:00
Manu Cornet
afd96a08b1 DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents
am: da5900d0a7

Change-Id: I1b4d9873c86cdb77d829c4ae6e5e6e3eae032eb1
2017-01-13 02:36:02 +00:00
TreeHugger Robot
2660111259 Merge "DO NOT MERGE - Also scale down thumbnail in app transitions for grid recents" into nyc-mr2-dev 2017-01-13 02:31:13 +00:00
Andrew Sapperstein
6c08f8da09 Add logging for high temp warning.
Adds a log line that prints the current and throttling temps
when we decide to show the notification.

Test: manual
Bug: 34256597
Change-Id: I4d0a1993e0b073d68fbc65f9aa765f5343a69dc5
2017-01-12 17:23:11 -08:00
Manu Cornet
569cbecd92 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
2017-01-13 01:07:43 +00:00
Manu Cornet
da5900d0a7 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
2017-01-13 01:05:17 +00:00
Manu Cornet
ae5df0544a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev
am: 5ee87b5b6a

Change-Id: I4ae207701f09d1a1723fca5fb237968ba5905574
2017-01-13 00:28:26 +00:00
Manu Cornet
bc6bdb3ef8 2D Recents: Use a different task dismiss animation
am: 5df7667edb

Change-Id: Ib6186c663057d7a3c8d44ec13254f6c8b76ce3de
2017-01-13 00:28:19 +00:00
Manu Cornet
5ee87b5b6a Merge "2D Recents: Use a different task dismiss animation" into nyc-mr2-dev 2017-01-13 00:23:48 +00:00
Robert Greenwalt
907585c004 Merge "Add support for FDN contact dial" am: 082b118641 am: 24dea10375
am: 503d8fbb26

Change-Id: I9642ea2e9a97d3fd72e9fdccc64f20c94a938088
2017-01-12 23:20:45 +00:00
Robert Greenwalt
503d8fbb26 Merge "Add support for FDN contact dial" am: 082b118641
am: 24dea10375

Change-Id: I5091d35ff79eff952c57109ce120369c95309598
2017-01-12 23:16:20 +00:00
Robert Greenwalt
24dea10375 Merge "Add support for FDN contact dial"
am: 082b118641

Change-Id: Ib7896cc64ea560338e7b737145eb7f96b4e89efc
2017-01-12 23:12:23 +00:00
Robert Greenwalt
082b118641 Merge "Add support for FDN contact dial" 2017-01-12 23:07:00 +00:00
Andrew Sapperstein
b5571b1a18 Merge "Create a global registry for system message IDs" into nyc-mr2-dev
am: 1f2769189d

Change-Id: I39320f591a7e67ac7af27bc533bdddd0b728ca68
2017-01-12 21:23:16 +00:00
Chris Wren
99a16ab0ec Create a global registry for system message IDs
am: 117d5b4f28

Change-Id: Iaa792c9dbffaae807bdf0a8cfb30e66aecb442d6
2017-01-12 21:23:11 +00:00
Andrew Sapperstein
1f2769189d Merge "Create a global registry for system message IDs" into nyc-mr2-dev 2017-01-12 21:18:28 +00:00
Andrew Rossignol
6ebc52a950 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev
am: c65a010a39  -s ours

Change-Id: I39efaeb589830e7d448e208d37a079c798477224
2017-01-12 18:59:56 +00:00
Andrew Rossignol
4fa95e7bbb Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"
am: 57edeef91a  -s ours

Change-Id: I4e4ed0215ad07f49101119c0f262d0dc5acbab8d
2017-01-12 18:59:51 +00:00
Jiaquan He
97b832a438 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev
am: 5c4c5e1682

Change-Id: Ide8408c2d18740b4058c49a9c3b4f0912e7c5da9
2017-01-12 18:56:34 +00:00
Jiaquan He
0cb857822e 2D Recents: Show shadows behind task views.
am: 15fa3246d8

Change-Id: Ia2401df9750bb42a53ae214ed8998e1225499337
2017-01-12 18:56:27 +00:00
TreeHugger Robot
c65a010a39 Merge "Revert "DO NOT MERGE ANYWHERE default_wallpaper: replace with black"" into nyc-mr2-dev 2017-01-12 18:52:42 +00:00
Jiaquan He
5c4c5e1682 Merge "2D Recents: Show shadows behind task views." into nyc-mr2-dev 2017-01-12 18:50:11 +00:00
Selim Cinek
8b36bbf0ea Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev
am: c1c7d1f938

Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa
2017-01-12 18:42:41 +00:00
Selim Cinek
97f14c47db Fixed a bug where notifications could stay expanded
am: b2236108ae

Change-Id: I9c776321f0865f6971692008256cd80adbab5469
2017-01-12 18:42:32 +00:00
Selim Cinek
c1c7d1f938 Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev 2017-01-12 18:37:07 +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
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
2f9af2aa69 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-12 17:19:04 +00:00
TreeHugger Robot
57988f49e6 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-12 17:17:50 +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
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
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
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
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