Manu Cornet
7a77305441
Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev am: f69e421f48
...
am: 661c6399de
2017-02-03 00:09:51 +00:00
Manu Cornet
13476b7747
2D Recents: fix toggling behavior am: a96a617a4e
...
am: 7a1a3d4529
2017-02-03 00:08:45 +00:00
Selim Cinek
bbed7fcf51
Merge "Fixed that the HUN layout could be visible on Keyguard" into nyc-mr2-dev
...
am: 9c95a9ccc6
2017-02-03 00:08:17 +00:00
Selim Cinek
f402af2081
Fixed that the HUN layout could be visible on Keyguard
...
am: b5aa599eec
2017-02-03 00:08:06 +00:00
Suprabh Shukla
585c683de9
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours am: 90b3d5a55d -s ours
...
am: 6f5506141d
2017-02-03 00:07:29 +00:00
Manu Cornet
661c6399de
Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev
...
am: f69e421f48
2017-02-03 00:02:28 +00:00
Manu Cornet
7a1a3d4529
2D Recents: fix toggling behavior
...
am: a96a617a4e
2017-02-03 00:02:22 +00:00
Suprabh Shukla
339dd0a4b2
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours
...
am: cda0f97790
2017-02-03 00:02:16 +00:00
Suprabh Shukla
6f5506141d
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours
...
am: 90b3d5a55d
2017-02-03 00:01:25 +00:00
Jeff Sharkey
6d3573e530
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
2017-02-02 23:59:49 +00:00
Jeff Sharkey
3e4faac39f
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
2017-02-02 23:59:49 +00:00
Jeff Sharkey
e6be8d765f
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
2017-02-02 23:59:47 +00:00
Jeff Sharkey
7115ad7119
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
2017-02-02 23:59:46 +00:00
Jeff Sharkey
1f007d1471
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
2017-02-02 23:59:45 +00:00
Jeff Sharkey
0354b89d31
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
2017-02-02 23:59:44 +00:00
Jeff Sharkey
6b8ae05e36
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
2017-02-02 23:59:42 +00:00
Selim Cinek
4f3463290b
Merge "Increased the collapsed size of messaging notifications"
2017-02-02 23:59:08 +00:00
Selim Cinek
9c95a9ccc6
Merge "Fixed that the HUN layout could be visible on Keyguard" into nyc-mr2-dev
2017-02-02 23:58:23 +00:00
Suprabh Shukla
cda0f97790
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours
...
am: 6b398f72cb
2017-02-02 23:57:44 +00:00
Manu Cornet
f69e421f48
Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev
2017-02-02 23:56:20 +00:00
Selim Cinek
d63d50adbb
Merge "Fixed that the HUN layout could be visible on Keyguard"
2017-02-02 23:55:59 +00:00
Suprabh Shukla
90b3d5a55d
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours
...
am: 58d9af0c77
2017-02-02 23:54:43 +00:00
Suprabh Shukla
6b398f72cb
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours
...
am: bcc2e70d40
2017-02-02 23:53:23 +00:00
Selim Cinek
f868efedd5
Fixed the background for low-priority legacy notifications
...
The background color could be calculated wrong in case we
Had a legacy notification with a dark background.
Test: install legacy custom notification with background, observe
Change-Id: Ie2a8ba4012f30719c05115f51bfddbdc8e33e551
Fixes: 34856700
2017-02-02 15:53:08 -08:00
Suprabh Shukla
58d9af0c77
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours
...
am: e3d5ea3a18
2017-02-02 23:49:45 +00:00
Suprabh Shukla
bcc2e70d40
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours
...
am: 32c6684a67
2017-02-02 23:48:18 +00:00
Suprabh Shukla
9e13fb4af7
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc am: 138c99e8c0
...
am: 5f491c1572
2017-02-02 23:46:06 +00:00
Suprabh Shukla
e3d5ea3a18
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours
...
am: 56be9656f7
2017-02-02 23:45:40 +00:00
Suprabh Shukla
32c6684a67
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours
...
am: 9690f8899b
2017-02-02 23:43:18 +00:00
Suprabh Shukla
5f491c1572
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc
...
am: 138c99e8c0
2017-02-02 23:41:24 +00:00
Suprabh Shukla
56be9656f7
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours
...
am: 6b1fd0f9cf
2017-02-02 23:41:18 +00:00
Pierre Lecesne
970732dc45
Expose whether a file was compressed before being loaded in memory.
...
This is useful when we want to write an APK and keep the same
compression parameters as the original APK.
Test: Unit tests pass.
Change-Id: I3afcae1c8727e429b08c9ac7359cf0789ff4abfc
2017-02-02 23:39:24 +00:00
Suprabh Shukla
9690f8899b
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours
...
am: 9394305cd7
2017-02-02 23:37:25 +00:00
Suprabh Shukla
1521b30607
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd am: 7314106770
...
am: 9665145f5b
2017-02-02 23:36:21 +00:00
Suprabh Shukla
138c99e8c0
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428
...
am: 710a7e40dc
2017-02-02 23:35:42 +00:00
Suprabh Shukla
6b1fd0f9cf
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours
...
am: 2b01e24b3f
2017-02-02 23:35:42 +00:00
Suprabh Shukla
bca734356e
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115 am: d176e0a508
...
am: 475fb1fbab
2017-02-02 23:35:23 +00:00
Jack Yu
5c6041843d
resolve merge conflicts of e06c03d843 to nyc-mr1-dev-plus-aosp
...
Test: Manual test
Change-Id: I13f288c5056b672eec00f850f9d2ee6db73b7a44
2017-02-02 15:33:40 -08:00
Suprabh Shukla
710a7e40dc
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8
...
am: 67a4d3e428
2017-02-02 23:31:51 +00:00
Suprabh Shukla
9394305cd7
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours
...
am: 20756a97ea
2017-02-02 23:31:41 +00:00
Suprabh Shukla
2b01e24b3f
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours
...
am: 170f2b9e7a
2017-02-02 23:31:09 +00:00
Jack Yu
7e34fb92e8
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb am: f565a487bb am: e06c03d843 am: d7aa4db998
...
am: 34722d7c01
2017-02-02 23:29:30 +00:00
Suprabh Shukla
170f2b9e7a
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours
...
am: 64e2b4f825
2017-02-02 23:26:38 +00:00
Hakan Seyalioglu
6136abb9fc
Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev am: a5a296e661
...
am: 8be3372bd6
2017-02-02 23:26:26 +00:00
Suprabh Shukla
67a4d3e428
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733
...
am: dcc633f1f8
2017-02-02 23:26:21 +00:00
Hakan Seyalioglu
7ddcf1fb5e
DO NOT MERGE - Check exported status in chooser am: e3286c3145
...
am: 531def93f0
2017-02-02 23:25:21 +00:00
Suprabh Shukla
20756a97ea
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours
...
am: c1a0e6db4c
2017-02-02 23:24:38 +00:00
Peter Qiu
41fba0bb0d
Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d am: 281fae21f8 am: eeeb10c645
...
am: 637c407d78
2017-02-02 23:24:11 +00:00
Manu Cornet
cf075206f0
Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev am: c01308a03c
...
am: ce4606a05f
2017-02-02 23:22:56 +00:00
Suprabh Shukla
9665145f5b
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd
...
am: 7314106770
2017-02-02 23:22:54 +00:00
