Commit Graph

302400 Commits

Author SHA1 Message Date
TreeHugger Robot
801e7bb7fd Merge "Do not select an importance for unspecified notifications" 2017-01-11 19:13:37 +00:00
Greg Daniel
6efc30e1b7 Merge "Add support for dummy draws for Vulkan webview and texture views." 2017-01-11 19:01:52 +00:00
Tao Bai
fe0c0e05be Merge "Load WebViewChromiumFactoryProviderForO" 2017-01-11 19:01:25 +00:00
Greg Daniel
63b18b3fda Merge "Break Layer class into Gl and Vulkan subclasses" 2017-01-11 19:00:34 +00:00
TreeHugger Robot
b82e176b55 Merge "Add new system api to pass parameters from Oobconfig to ManagedProvisioning" 2017-01-11 18:56:37 +00:00
Andrii Kulian
b6aa0cc60c Merge "Fix typo that caused excessive display config updates" 2017-01-11 18:47:00 +00:00
phweiss
9b89a90aea Add ticker text for network logging notification am: df7bfcfc22
am: 8b2472a428

Change-Id: I177295c148dd076889a64ab839d71e56de6e78a8
2017-01-11 18:43:02 +00:00
phweiss
8b2472a428 Add ticker text for network logging notification
am: df7bfcfc22

Change-Id: Iff2f2e9866eb9b4bc018965bdd48eaff5bbc9af3
2017-01-11 18:37:58 +00:00
TreeHugger Robot
f88f0f1b1e Merge "Use bitfields in GNSS HAL" 2017-01-11 18:33:21 +00:00
Makoto Onuki
a59e4503a1 Merge "Update the javadoc on requestPinShortcut() about multiple..." 2017-01-11 18:13:04 +00:00
Alison Cichowlas
0f642d2709 Merge "Add a required main category for multi logs." 2017-01-11 17:54:13 +00:00
Geoffrey Pitsch
4e7ae02ce0 Do not select an importance for unspecified notifications
Test: runtest systemui-notification
Bug: 34164846
Change-Id: I4988ce26264853fd9ab84ae02e995641edf933cd
2017-01-11 12:48:09 -05:00
Robin Lee
3101b3ad21 Merge changes I3fd28e69,If43820b6
* changes:
  Lock work tasks from SystemUI instead of ActivityStarter
  Bounce work challenge through a WorkLockActivity
2017-01-11 17:41:01 +00:00
TreeHugger Robot
48ee82ad5b Merge "Revert "Update active fingerprint group when switching profiles"" 2017-01-11 17:22:54 +00:00
Akira Oshimi
c64e7ae269 Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd am: d999e53487
am: fb6616a6a6

Change-Id: Id4a4ef2672c614ac4343becf238f654c8e83caa5
2017-01-11 17:18:09 +00:00
Mark Salyzyn
7a98aee66a Merge "resolve merge conflicts of 082a1721b5 to master" 2017-01-11 17:13:02 +00:00
Phil Weaver
74bf350176 Merge "Accessibility support for ClickableSpan" 2017-01-11 16:42:29 +00:00
Mark Salyzyn
db15537e6e resolve merge conflicts of 082a1721b5 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
2017-01-11 08:30:17 -08:00
Neil Fuller
505d8262ab resolve merge conflicts of 46c39f6c36 to master
Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052
2017-01-11 16:15:13 +00:00
Akira Oshimi
fb6616a6a6 Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd
am: d999e53487

Change-Id: I7a1420c595f187923ad565d080e05c15c98d7dce
2017-01-11 16:11:53 +00:00
Hridya Valsaraju
b39eb40587 Use bitfields in GNSS HAL
Test: mm
Bug: 31974439
Change-Id: Ic14715d7bc55a3460756b07190bf02d6cebe3c52
2017-01-11 08:08:40 -08:00
Akira Oshimi
d999e53487 Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8
am: 49b68ad0cd

Change-Id: I02de0a87c633f4ffc8cee81e8773e31c9851d19d
2017-01-11 16:06:22 +00:00
TreeHugger Robot
2d75264011 Merge "Fixes for FlashlightTile lifecycle" 2017-01-11 16:02:54 +00:00
Akira Oshimi
49b68ad0cd Merge "Fix clipping for edit screen of Quick Settings"
am: e3677865a8

Change-Id: Idb615698c433bd4436950cbf94ced95f02198cd9
2017-01-11 16:01:23 +00:00
Diego Perez
5becc4872f Merge "Call onApplyWindowInsets after requestApplyWindowInsets" 2017-01-11 15:57:15 +00:00
Treehugger Robot
e3677865a8 Merge "Fix clipping for edit screen of Quick Settings" 2017-01-11 15:51:37 +00:00
Lenka Trochtova
c70ca2d8f2 Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f am: 44a53bab46
am: aa369e5d19

Change-Id: Iac1ae24754e012d31341f3a2b6fec3c637180f8e
2017-01-11 15:48:30 +00:00
Mark Salyzyn
082a1721b5 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
am: ef8ccc8510

Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
2017-01-11 15:45:46 +00:00
Neil Fuller
261a1dcffd Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 am: 43d53395dc
am: 75f84f2261

Change-Id: I5cf584048e1e2cde67c33d77e99cd181db4e8c82
2017-01-11 15:45:29 +00:00
Richard Uhler
832af67c1d Merge "Cleanup code given PATCHOAT_FOR_RELOCATION has been removed." am: 8582826f8d am: 5c5637e1bd am: 4911e517ab
am: c662c1541b

Change-Id: I2ac812bdbd3a8fb8619d5c8d1694fb67a8a69632
2017-01-11 15:41:36 +00:00
Erik Kline
96ac5e685b Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e am: 305796276b
am: 1559d51f86

Change-Id: I4cbcc423be83613555e69f894e2d09004d363e5a
2017-01-11 15:40:27 +00:00
Mark Salyzyn
ef8ccc8510 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
2017-01-11 15:40:24 +00:00
Santos Cordon
88c43ef3ae Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: a00c235600
am: 27e121f27f

Change-Id: I527300ce4f4182c278a2e065f2e5a3c322c79433
2017-01-11 15:39:30 +00:00
Santos Cordon
e7da78b039 Add Brightness setting for VR Mode. am: d6a5660a2c
am: f85ab8306f  -s ours

Change-Id: Iea1f7d32d9c478fd7b1e0477ec12d811d6bd0daf
2017-01-11 15:38:29 +00:00
Mark Salyzyn
6143cbf1e5 Merge "Replace cutils/log.h and log/logger.h with log/log.h"
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
2017-01-11 15:35:19 +00:00
Rubin Xu
381f2acdf4 Revert "Update active fingerprint group when switching profiles"
This reverts commit d37c824c14.

Change-Id: Id9c7a9c1fef276aa45f4ffc7559f61d1dbdaf7ba
2017-01-11 15:24:14 +00:00
Mark Salyzyn
e7fcbcb991 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 2017-01-11 15:24:11 +00:00
Neil Fuller
46c39f6c36 Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6 am: 5be9960f66
am: d544a4c682

Change-Id: I9e2ee5c872aaa500378900962899672f318e294c
2017-01-11 15:13:08 +00:00
Lenka Trochtova
aa369e5d19 Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97 am: 345362c66f
am: 44a53bab46

Change-Id: Ide191d76911c7909b2ffa6969f6d2481b1b27276
2017-01-11 15:09:46 +00:00
phweiss
df7bfcfc22 Add ticker text for network logging notification
Set ticker text to title for accessibility.

Bug:31207965
Test: manual

Change-Id: I0b78f9e6464dd470b74e0db97813623b335835d9
(cherry picked from commit d4a54bbfd1)
2017-01-11 15:04:00 +00:00
Philipp Weiß
34cb734d49 Merge "Add ticker text for network logging notification" 2017-01-11 15:03:28 +00:00
Neil Fuller
d544a4c682 Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
am: 5be9960f66

Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd
2017-01-11 15:02:42 +00:00
Lenka Trochtova
44a53bab46 Merge "Don't offer the BT sharing option to the user if BT is disallowed." am: 0c1a4b6a97
am: 345362c66f

Change-Id: I56d94f43683581d940d3711c9ca86fee0861b0e6
2017-01-11 14:59:18 +00:00
Jorim Jaggi
d8f2268e3c Merge "Clean up starting window to prepare for saved surfaces" 2017-01-11 14:58:50 +00:00
Neil Fuller
5be9960f66 Merge "Switch ConfigUpdater to the new version of timezone updater code"
am: 216303cdb6

Change-Id: I106699e4f141b27e0ace17d4997a2a67bf6a7c55
2017-01-11 14:54:51 +00:00
Lenka Trochtova
345362c66f Merge "Don't offer the BT sharing option to the user if BT is disallowed."
am: 0c1a4b6a97

Change-Id: Ic304d77ea532a1a6a6539ba9d4dca35a0f628ff2
2017-01-11 14:49:09 +00:00
Neil Fuller
216303cdb6 Merge "Switch ConfigUpdater to the new version of timezone updater code" 2017-01-11 14:46:47 +00:00
Jason Monk
861e09ade2 Fixes for FlashlightTile lifecycle
Change-Id: I690440465ef5312d77a279e73eaa22ccbdfbcd53
Fixes: 33861261
Test: runtest systemui
2017-01-11 09:41:05 -05:00
Treehugger Robot
0c1a4b6a97 Merge "Don't offer the BT sharing option to the user if BT is disallowed." 2017-01-11 14:40:06 +00:00
Robin Lee
c41f6ec877 Lock work tasks from SystemUI instead of ActivityStarter
By adding an onTaskProfileLocked(taskId, userId) RPC to
TaskStackListener and routing that through to a new WorkLockController.

Bug: 31001762
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest
Change-Id: I3fd28e6926c3f928e78b3c6ce0fe27413617695f
2017-01-11 14:13:07 +00:00