Petri Gynther
6a2ed0aed5
Merge "Set default value of A2DP HW offload toggle" into pi-dev am: d6acb081af
...
am: 6cc221169b
Change-Id: Ia6097eeec41c0d19b06ce01db136e208a4cb6ebb
2018-05-24 23:46:01 -07:00
TreeHugger Robot
8653748a18
Merge "Fix a NPE when highlighting fingerprint row."
2018-05-24 21:44:50 +00:00
Julia Reynolds
429c787168
[automerger skipped] Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev am: 718c344daf
...
am: db581cb3d4
-s ours
Change-Id: I016f444e1edc45973698901f02450327218e5303
2018-05-23 19:32:43 -07:00
Petri Gynther
6cc221169b
Merge "Set default value of A2DP HW offload toggle" into pi-dev
...
am: d6acb081af
Change-Id: I2b39c0b17613fafd88954505bf1d982dcc55014b
2018-05-23 18:09:27 -07:00
Petri Gynther
d6acb081af
Merge "Set default value of A2DP HW offload toggle" into pi-dev
2018-05-23 23:59:19 +00:00
TreeHugger Robot
acee9007f6
Merge "Setting to change sysui theme"
2018-05-23 23:22:15 +00:00
Julia Reynolds
db581cb3d4
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
...
am: 718c344daf
Change-Id: Ib539d391b3517e9281337a5ba3972bd8ca21caf1
2018-05-23 16:11:08 -07:00
Jayachandran Chinnakkannu
981791df47
[automerger skipped] Merge "Remove connectivity monitor switch from developer options" into pi-dev am: 8d7ccc0074
...
am: 433cca7577
-s ours
Change-Id: Ia9177fc830d5f99ea2c9ace03a88ab62525c3642
2018-05-23 16:08:46 -07:00
Matthew Fritze
8e54e4a0f5
Merge "Hook up blocked keys" into pi-dev am: a60ea38f67
...
am: a8e1a02bfa
Change-Id: Ib79a5fe4721086f400477dc159e14ab5e641e304
2018-05-23 16:06:57 -07:00
Matthew Fritze
270ac03126
[automerger skipped] Merge "Inline slider with header" into pi-dev am: 666ee4fa14
...
am: dc001563ae
-s ours
Change-Id: I57208dd70a098e15792b339ea6353ee218ab67eb
2018-05-23 16:06:19 -07:00
Julia Reynolds
fea643e243
Merge "Use standard displayPreference" into pi-dev am: eba0723a57
...
am: b7bfb04f50
Change-Id: I8f6704247d5e633cc1d6cd3d75403837606fca03
2018-05-23 16:05:38 -07:00
Daichi Ueura
cbd04dcade
Merge "Hide entire hidden field for non-hidden networks" into pi-dev am: 2c793dfeff
...
am: 1a2153e6ab
Change-Id: Id5dc0b1855520c9071ce3b8c2897f2b69d3b3791
2018-05-23 16:05:02 -07:00
Fan Zhang
a17d1b03dc
[automerger skipped] Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev am: 87dfe60ad0
...
am: b82d639f34
-s ours
Change-Id: I6970932b5536ee4938e20802ce8041295b4923d7
2018-05-23 16:04:20 -07:00
Matthew Fritze
2a11158392
[automerger skipped] Merge "Return null when setting can't be changed." into pi-dev am: c7b90ee998
...
am: 9c49a3a20d
-s ours
Change-Id: I14fa7dc962384c564ad9ff1c96528b40b7bbb31b
2018-05-23 16:03:41 -07:00
Matthew Fritze
43c5f7bc1c
[automerger skipped] Merge "Add Location Slice" into pi-dev am: 53f6b7cb06
...
am: b8b2c0c265
-s ours
Change-Id: If6e5d2770bc799232342be8a1103c94fdb5f1914
2018-05-23 16:02:53 -07:00
Matthew Fritze
e656ffd83c
Merge "Clear indexing before adding all Slices" into pi-dev am: 842ea91baa
...
am: 6f8bfd5fec
Change-Id: I4a56f4af28b980480c17b4de918b3aeb052f40e5
2018-05-23 16:02:00 -07:00
Antony Sargent
cbbcac2ac3
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev am: e0e49140d2
...
am: 107242f7b1
Change-Id: I386a9b1902a36f7cc16ec0bd8e773de6678d8516
2018-05-23 16:01:21 -07:00
Antony Sargent
507fe6d909
Merge "Update storage, videogame, and vpn icons" into pi-dev am: 28dc3917a9
...
am: e3ce1df654
Change-Id: Ic5906d22df49ca2236727c7edcd6192426795fcb
2018-05-23 16:00:31 -07:00
Matthew Fritze
ce6de9b5b8
[automerger skipped] Merge "Update airplane mode key to match framework constant" into pi-dev am: 6be5e331cf
...
am: 73ed33af27
-s ours
Change-Id: I2564e4d3938d9798588ea9ef98c7830e120c24e3
2018-05-23 15:59:52 -07:00
Erik Kline
e1a5ac804d
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev am: 5a0a7ef4bb
...
am: cf83539e1e
Change-Id: Ia06f5bef6d4103cf65a2c07d8dadecfa815080f7
2018-05-23 15:59:09 -07:00
Lucas Dupin
74fde3ea31
Setting to change sysui theme
...
Users now can manually pick if they want light or dark QS
and launcher
Change-Id: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes: 63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
2018-05-23 15:20:17 -07:00
Jayachandran Chinnakkannu
433cca7577
Merge "Remove connectivity monitor switch from developer options" into pi-dev
...
am: 8d7ccc0074
Change-Id: Ic68439308f7d591595876488afa76e57b9414089
2018-05-23 15:12:55 -07:00
TreeHugger Robot
718c344daf
Merge "DO NOT MERGE Handle usageevents for work profile apps" into pi-dev
2018-05-23 21:49:56 +00:00
Matthew Fritze
a8e1a02bfa
Merge "Hook up blocked keys" into pi-dev
...
am: a60ea38f67
Change-Id: I464e3068051471f05512068bc020866f8d8d8f85
2018-05-23 14:49:32 -07:00
Matthew Fritze
dc001563ae
Merge "Inline slider with header" into pi-dev
...
am: 666ee4fa14
Change-Id: I16c56185628f7dde2a8dbd04bd4b8509163a2fbe
2018-05-23 14:48:51 -07:00
Julia Reynolds
b7bfb04f50
Merge "Use standard displayPreference" into pi-dev
...
am: eba0723a57
Change-Id: I1394513d9d57577af2a5e0a253ff6ecb548e936d
2018-05-23 14:48:08 -07:00
Daichi Ueura
1a2153e6ab
Merge "Hide entire hidden field for non-hidden networks" into pi-dev
...
am: 2c793dfeff
Change-Id: I3cd2bb7d87e371a8db5b1ea693c424b6314f08f2
2018-05-23 14:47:28 -07:00
Fan Zhang
b82d639f34
Merge "Convert BatterySaverButton controller to Slice compatible." into pi-dev
...
am: 87dfe60ad0
Change-Id: I30f5d13f0c5f430b09585ad2114f0f1ad98eebc9
2018-05-23 14:46:45 -07:00
Matthew Fritze
9c49a3a20d
Merge "Return null when setting can't be changed." into pi-dev
...
am: c7b90ee998
Change-Id: I3112475e7cbe477f94c129be78d55b430760df75
2018-05-23 14:45:58 -07:00
Matthew Fritze
b8b2c0c265
Merge "Add Location Slice" into pi-dev
...
am: 53f6b7cb06
Change-Id: I0a18f0a70e9a653acf3fad8bf7c68763aa4d24a3
2018-05-23 14:45:10 -07:00
Matthew Fritze
6f8bfd5fec
Merge "Clear indexing before adding all Slices" into pi-dev
...
am: 842ea91baa
Change-Id: I6a1a0903ac0e7538e013eebe6071d1b7ff496412
2018-05-23 14:44:03 -07:00
Antony Sargent
107242f7b1
Merge "Update photo, accessibility, memory, sim, and warning icons" into pi-dev
...
am: e0e49140d2
Change-Id: Ie05b424868cfd46dce36b792a4006dd2cce0aeba
2018-05-23 14:43:19 -07:00
Antony Sargent
e3ce1df654
Merge "Update storage, videogame, and vpn icons" into pi-dev
...
am: 28dc3917a9
Change-Id: I7904f669edc41f2d19369a02bb8efdd360d4445f
2018-05-23 14:41:37 -07:00
Matthew Fritze
73ed33af27
Merge "Update airplane mode key to match framework constant" into pi-dev
...
am: 6be5e331cf
Change-Id: Ifb10ad7d2dd23359dab8ee1307751a0b49082cbb
2018-05-23 14:40:55 -07:00
Erik Kline
cf83539e1e
Merge "Factor in PRIVATE_DNS_MODE_DEFAULTSETTING value" into pi-dev
...
am: 5a0a7ef4bb
Change-Id: I01f80ccf9c733d280b38250e6735717004cbec1b
2018-05-23 14:25:29 -07:00
Jayachandran Chinnakkannu
8d7ccc0074
Merge "Remove connectivity monitor switch from developer options" into pi-dev
2018-05-23 20:57:30 +00:00
Julia Reynolds
a30e046597
DO NOT MERGE Handle usageevents for work profile apps
...
Test: robotests
Change-Id: Ifdc6e456d76614220b2052e6ca8a8f3676d0e2ee
Fixes: 79142791
2018-05-23 20:49:33 +00:00
TreeHugger Robot
a60ea38f67
Merge "Hook up blocked keys" into pi-dev
2018-05-23 20:41:22 +00:00
TreeHugger Robot
9ae99272cf
Merge "Update phone vibrate icon in condition card."
2018-05-23 20:35:24 +00:00
Fan Zhang
13c7e68646
Fix a NPE when highlighting fingerprint row.
...
If fingerprint pref is not bound to UI yet, then its view is null so we
can't do any ripple animation on it.
Change-Id: I0ccca2dfdb471ab520677c6cd206205230959b27
Fixes: 80147956
Test: manual
2018-05-23 20:29:01 +00:00
TreeHugger Robot
666ee4fa14
Merge "Inline slider with header" into pi-dev
2018-05-23 19:32:41 +00:00
TreeHugger Robot
1cedea2383
Merge "Refactor nfc preference controller"
2018-05-23 19:29:44 +00:00
TreeHugger Robot
93bbca22bf
Merge "Inline slider with header"
2018-05-23 19:29:24 +00:00
Matthew Fritze
4242ed2171
Hook up blocked keys
...
Block any slice in onBind that is the in the blacklist
Change-Id: I9687d07cbfef5fcb94842046bc5dc3296eed4252
Fixes: 80195653
Test: robotests
2018-05-23 12:25:23 -07:00
Fan Zhang
18fb991a8e
Update phone vibrate icon in condition card.
...
Bug: 80157879
Test: visual
Change-Id: I836582056f2da7c7aa379ac84302bf84b398924a
2018-05-23 12:23:45 -07:00
TreeHugger Robot
eba0723a57
Merge "Use standard displayPreference" into pi-dev
2018-05-23 18:44:28 +00:00
Matthew Fritze
250e26aff9
Inline slider with header
...
Add a header to the slider slices to allow for a second line of text.
This is important to add more context to slices outside of settings.
Fixes: 80157462
Test: robotests
Merged-In: Ida90c9377afb19de320dfce54175f51eee088cfe
Change-Id: I1a1be345e84cbd9f300440e6431d4b331d051dac
2018-05-23 11:28:41 -07:00
Matthew Fritze
647be5fc91
Inline slider with header
...
Add a header to the slider slices to allow for a second line of text.
This is important to add more context to slices outside of settings.
Bug: 80157462
Test: robotests
Change-Id: Ida90c9377afb19de320dfce54175f51eee088cfe
2018-05-23 11:26:54 -07:00
Matthew Fritze
41cbe4b78d
[automerger skipped] Merge "Add isSliceable API to BasePrefController" into pi-dev am: ef950c24bd
...
am: 0cf8b408f9
-s ours
Change-Id: I01a7cd3c08acb13773cd920bc95d5f1dbbdc9297
2018-05-23 11:25:35 -07:00
TreeHugger Robot
2c793dfeff
Merge "Hide entire hidden field for non-hidden networks" into pi-dev
2018-05-23 18:15:04 +00:00