Shinji Sogo
3bd405bd72
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d am: e67395a97a am: 80fba49386
...
am: ee05b648c7
Change-Id: I29e7c9ce4c437ac3e012516a2bfd4c3cf8981aae
2016-12-16 01:42:55 +00:00
Hall Liu
97ca11cf43
Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev am: e6d5a19e5f
...
am: dbaca965bb
Change-Id: I7cb1aea992cea7ee376df1eb3acf98782e44d5ab
2016-12-16 01:40:50 +00:00
Wei Huang
494e39e969
Adds carrier config to determine if high definition audio is displayed am: f84a966106
...
am: 0a26ddc7a3 -s ours
Change-Id: Icbe09d5df96fe6625efda8df153acb68d64ab29c
2016-12-16 01:39:53 +00:00
Adrian Roos
4f82694914
Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev am: 23c46fb117
...
am: ef4812cdcf -s ours
Change-Id: I8366b1ca3362701124dcb8c79de97e0aa84d406f
2016-12-16 01:29:57 +00:00
Adrian Roos
b14df6ddfc
DirectReply: Show bouncer when occluded am: f37fce5182
...
am: ad0ed5c63c -s ours
Change-Id: I992b1c2d537e93066fb863b18ae5777bfc4e46fd
2016-12-16 01:28:44 +00:00
TreeHugger Robot
af7c0c7d93
Merge "Remove hardcoded actionbar background color."
2016-12-16 01:13:08 +00:00
Chris Craik
1c027f9f4e
Merge "Fix non-critical jni entry points"
2016-12-16 00:43:34 +00:00
Chris Craik
26bced489a
Fix non-critical jni entry points
...
Test: manual
Change-Id: I424d4db388f5e39650d7eb31fd461cd4831b5848
2016-12-15 16:35:10 -08:00
Brad Ebinger
23e0fd6cdd
Merge "Add UI prompt for MMI code failure on 3gpp"
2016-12-16 00:07:58 +00:00
TreeHugger Robot
984c73ba73
Merge "Modify savelayer to save matrix and clip for Skia pipeline"
2016-12-16 00:01:06 +00:00
Shinji Sogo
ee05b648c7
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d am: e67395a97a
...
am: 80fba49386
Change-Id: I15cabf9e4146f1f0d0c31b24d222c34b8477cdb7
2016-12-15 23:38:59 +00:00
John Reck
4c80f87820
Merge "HWUI: prepare script for marlin & sailfish Test: this is a bench infrastucture"
2016-12-15 23:37:22 +00:00
Hall Liu
dbaca965bb
Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev
...
am: e6d5a19e5f
Change-Id: Ifb5c7df88ad6191dfbfeda29b9b5fed97a32e530
2016-12-15 23:07:04 +00:00
Wei Huang
0a26ddc7a3
Adds carrier config to determine if high definition audio is displayed
...
am: f84a966106
Change-Id: I030077b8f9a8fa9f05d1a71f051cd19059c54bab
2016-12-15 23:06:53 +00:00
Shinji Sogo
80fba49386
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d
...
am: e67395a97a
Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
2016-12-15 23:04:21 +00:00
TreeHugger Robot
5fb5881dbd
Merge "Adding support for PIP actions."
2016-12-15 22:52:30 +00:00
Hall Liu
e6d5a19e5f
Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev
2016-12-15 22:41:38 +00:00
Adrian Roos
ef4812cdcf
Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev
...
am: 23c46fb117
Change-Id: Idb6278c0b74c0308e77eab33c2c4cb503d93c123
2016-12-15 22:37:11 +00:00
Adrian Roos
ad0ed5c63c
DirectReply: Show bouncer when occluded
...
am: f37fce5182
Change-Id: Ib3f82893fe744a3d382841e17e5a8e8dc1c3c19b
2016-12-15 22:37:00 +00:00
Fan Zhang
697e186820
Remove hardcoded actionbar background color.
...
Bug: 33558692
Test: visual
Change-Id: Ia95799f86eab5b9566cca52ee0409d303e16a3c6
2016-12-15 14:34:26 -08:00
Shinji Sogo
e67395a97a
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
...
am: 69e7f9683d
Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990
2016-12-15 22:32:03 +00:00
Adrian Roos
23c46fb117
Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev
2016-12-15 22:22:57 +00:00
Treehugger Robot
69e7f9683d
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
2016-12-15 22:17:48 +00:00
Amith Yamasani
0a5aeecf4e
Merge "Revert "[DPM] Allow lower strong auth timeout on debuggable builds""
2016-12-15 22:15:46 +00:00
TreeHugger Robot
d101b86351
Merge "DirectReply: Show bouncer when occluded"
2016-12-15 22:15:22 +00:00
Roozbeh Pournader
ff53f923e9
Merge "Use TextDirectionHeuristics to detect text direction in Html"
2016-12-15 22:00:38 +00:00
Roozbeh Pournader
2beaa2e45e
Merge "Use ICU for formatting in DateUtils.formatDuration"
2016-12-15 21:59:46 +00:00
Chris Craik
9180f64186
Merge "CriticalNative for RenderNode and DisplayListCanvas"
2016-12-15 21:48:17 +00:00
TreeHugger Robot
711911bb95
Merge "Actually fix pixelcopy for 90/180/270 rotation"
2016-12-15 21:47:58 +00:00
Stan Iliev
68885e38b8
Modify savelayer to save matrix and clip for Skia pipeline
...
Modify SkiaCanvas::saveLayer to always save matrix and clip and
match HWUI behaviour. Also ensure android state tracking
behavior matches that of the Skia API (partial saves not
supported). This change is fixing SaveLayerAnimation
macrobench when buffer age is disabled.
Add a HWUI unit test that verifies clip and matrix are restored.
Test: built and ran angler-eng, ran hwui unit tests
bug:33429678
Change-Id: I62e429f9746518fef67663b0dd99ac499bf31af3
2016-12-15 16:47:34 -05:00
Adrian Roos
91d2283e5d
Merge "FalsingLog: Fix false positive Log.wtfs"
2016-12-15 21:41:11 +00:00
TreeHugger Robot
8102d91377
Merge "Teleportation between clusters."
2016-12-15 21:40:12 +00:00
Michael Kwan
ccc90afbbc
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am: 738fb65657 am: 106821edfe
...
am: 763ab36642
Change-Id: Iabfe741520f3e25d1ea22eade563e387c98f6216
2016-12-15 21:39:22 +00:00
Michael Kwan
a49b3fe918
Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b am: 3707030cf5
...
am: 78f89e42e3
Change-Id: Id3d243007d56ac959810c7a26f4e30059dd1be57
2016-12-15 21:38:16 +00:00
Michael Kwan
76ee9b5c64
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am: 738fb65657 am: a14aa31ef5
...
am: 11655cd1f7
Change-Id: I663d3a83137b72c8bbb041857f9ed10f288218b1
2016-12-15 21:31:59 +00:00
Michael Kwan
763ab36642
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am: 738fb65657
...
am: 106821edfe
Change-Id: I22a94a690862e5456d17e0e2ccd9f62ac9851240
2016-12-15 21:31:48 +00:00
Michael Kwan
8592fdafdd
Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b am: 4308eaa477
...
am: f6876c1169
Change-Id: I342c832da0a91f536d9b935037d13ba23d9912a9
2016-12-15 21:30:48 +00:00
Michael Kwan
78f89e42e3
Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b
...
am: 3707030cf5
Change-Id: Ia856a0b54eebc6821fff47cd90f05d73f49fdefd
2016-12-15 21:30:42 +00:00
Michael Kwan
11655cd1f7
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev am: 738fb65657
...
am: a14aa31ef5
Change-Id: I4ae6d6728c607c985943bce7e4f241c006878f8b
2016-12-15 21:24:55 +00:00
Michael Kwan
f6876c1169
Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b
...
am: 4308eaa477
Change-Id: Id5fa0c8bd66ca7970c971884c1067aca4ac24124
2016-12-15 21:23:44 +00:00
Michael Kwan
106821edfe
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
...
am: 738fb65657
Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
2016-12-15 21:16:19 +00:00
Michael Kwan
3707030cf5
Fix swipe-to-dismiss to properly react to swipe gestures.
...
am: 8a9b27773b
Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
2016-12-15 21:16:15 +00:00
Michael Kwan
a14aa31ef5
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
...
am: 738fb65657
Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772
2016-12-15 21:16:08 +00:00
Michael Kwan
4308eaa477
Fix swipe-to-dismiss to properly react to swipe gestures.
...
am: 8a9b27773b
Change-Id: I2b25052c22b5f50f95d0365eff4e3b2e27625b7f
2016-12-15 21:16:05 +00:00
Michael Kwan
738fb65657
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
2016-12-15 21:09:57 +00:00
Martijn Coenen
97a29963dc
Merge "HwBinder: Remove use of IHw class." am: 11ec22ab2a am: df296fe1fa am: 370815ef62
...
am: 432a964dde
Change-Id: I49a5311e7949844c2bfdc15e5d94cac3abe4ba69
2016-12-15 21:04:35 +00:00
dcashman
2375e48eec
Merge "Split mac_permissions.xml into plat and non-plat components." am: a1c9c860a9 am: 455202b9db am: 33d3d19235
...
am: f9acea3de2
Change-Id: Ie9648ad98c9f3a12641cd5bcf6affb39534c22b1
2016-12-15 21:03:20 +00:00
Julia Reynolds
723694ca0f
Merge "Volume header changes"
2016-12-15 21:01:06 +00:00
dcashman
d9a76c34bb
Split mac_permissions.xml into plat and non-plat components. am: b1cc4f8ca4 am: 2a7ce100b7 am: 46d6966f43
...
am: aa9ada00e6
Change-Id: I1af0ca0508e0b9fb9b30644e9f097ad7da7f5f34
2016-12-15 20:56:06 +00:00
Martijn Coenen
432a964dde
Merge "HwBinder: Remove use of IHw class." am: 11ec22ab2a am: df296fe1fa
...
am: 370815ef62
Change-Id: I9a6b8dc6cf2e4c9d424c34513129d965155a0df7
2016-12-15 20:55:49 +00:00