Lei Yu
7f8a269a3a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
2019-06-03 10:06:14 -07:00
Lei Yu
057dc8466a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50
Merge "Use new API to build NetworkTemplate" into qt-dev
2019-06-03 16:54:29 +00:00
Joel Galenson
efbf351167
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
Change-Id: I90215bb8b92b6a5288647891bf5042e5a5802486
2019-05-31 15:04:56 -07:00
TreeHugger Robot
4a9055a99c
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
ecf3028123
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: c4be5512a7
Change-Id: I61477938f506b07ce01ad8d3b6214fb38df1936a
2019-05-31 14:34:09 -07:00
Mehdi Alizadeh
9b378dd381
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
c4be5512a7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
2019-05-31 14:26:04 -07:00
Mehdi Alizadeh
cad67cdc0a
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488
Disables the Gesture nav option if 3P launcher is default
...
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.
Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Lei Yu
a22bf1cd8b
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: fad8cec592
Change-Id: I9b4a73685b8091760f375b58ad58d501046386d9
2019-05-31 10:53:59 -07:00
Lei Yu
fad8cec592
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
2019-05-31 10:41:54 -07:00
Lei Yu
677d5a5e01
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
Change-Id: Ifd2d4c3928ba706071a575c28db21c7586a2e692
2019-05-31 10:40:50 -07:00
Lei Yu
ded55a1401
Use new API to build NetworkTemplate
...
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.
Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207
Merge "Fix issues in battery usage accounting" into qt-dev
2019-05-31 17:17:51 +00:00
Joel Galenson
2118f8a63f
Revert "Remove Permissions Hub."
...
This reverts commit 1e7c172ad5
.
Bug: 132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
2019-05-31 07:55:19 -07:00
Joel Galenson
0709624634
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
Change-Id: I87733a341c28ebd6bbaa3bfe846fc835dc4a745e
2019-05-31 06:12:29 -07:00
Joel Galenson
d8efe209f7
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4
Merge "Remove Permissions Hub." into qt-dev
2019-05-31 13:02:12 +00:00
zoey chen
3aa9c79341
UE showed wrong title and message when enabling data roaming.
...
It set wrong string when building the roaming dialog.
BUG: 133731388
Test: Manual test
Change-Id: Ib46b2b2ba1d62f84da7cd82bbbc03fe4f3069afc
2019-05-31 17:37:26 +08:00
Lucas Dupin
d3e686fc33
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
...
am: 1a3112ab32
Change-Id: I8c0512ac98aecfb3306ee89e3a4ff1e711f45d89
2019-05-30 21:27:15 -07:00
TreeHugger Robot
1a3112ab32
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
2019-05-31 04:15:54 +00:00
Ilya Matyukhin
c6f766ec2b
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
...
am: dbe399a023
Change-Id: Ie6c6b6cb22ba783ee402e5c9fb0cae510c6f8fdf
2019-05-30 18:10:09 -07:00
TreeHugger Robot
dbe399a023
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
2019-05-31 00:52:11 +00:00
Joshua Mccloskey
9b79a4c902
Merge "String update." into qt-r1-dev
...
am: b471e2439c
Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
2019-05-30 16:32:47 -07:00
Joshua Mccloskey
b471e2439c
Merge "String update." into qt-r1-dev
2019-05-30 23:12:53 +00:00
Alex Salo
ac7851e1ce
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
...
am: fa127bd6f7
Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
2019-05-30 22:59:12 +00:00
Ilya Matyukhin
d59150eca6
Add generateChallenge() in onResume()
...
Fixes: 133498264
Fixes: 133440610
Test: open FaceSettings from Settings with and without an enrolled face
Test: open FaceSettings from the notification that asks to re-enroll
Change-Id: I80ca7644f96a538614962232fb3951d1a91d87c7
2019-05-30 15:01:22 -07:00
Lucas Dupin
8c29afdc3f
Fix exception on non face-enabled devices
...
Test: open privacy settings page
Bug: 130327302
Change-Id: I31ba9f30bb7300bff6daea8a51ed6c4dc2a373f2
2019-05-30 14:58:52 -07:00
Julia Reynolds
71420a2209
Merge "Change notification alert icon" into qt-dev am: 2821456995
...
am: f5afaffc2c
Change-Id: I340a6394fece9fe398e92c219b3a186db341001c
2019-05-30 14:22:17 -07:00
Julia Reynolds
72182e1ffc
Merge "Change notification alert icon" into qt-dev
...
am: 2821456995
Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d
2019-05-30 14:11:52 -07:00
Julia Reynolds
f5afaffc2c
Merge "Change notification alert icon" into qt-dev
...
am: 2821456995
Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
2019-05-30 14:08:51 -07:00
TreeHugger Robot
2821456995
Merge "Change notification alert icon" into qt-dev
2019-05-30 20:51:49 +00:00
Christine Franks
3ccc01ca18
Merge "Add SIM color picker" into qt-dev am: b747c5c270
...
am: c1c4a0858d
Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d
Merge "Add SIM color picker" into qt-dev
...
am: b747c5c270
Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270
Merge "Add SIM color picker" into qt-dev
2019-05-30 20:01:48 +00:00
Julia Reynolds
9ae4df15fd
Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb
...
am: 9e865f88be
Change-Id: Icd84f4b664f5aaa58cca23c2c89b9a4c3412981d
2019-05-30 12:16:41 -07:00
Julia Reynolds
9e865f88be
Merge "Fix a11y readout of notification importance buttons" into qt-dev
...
am: 1b25f986cb
Change-Id: I7c94082364ef16412ef2613003c91881905ba12a
2019-05-30 12:10:23 -07:00
Julia Reynolds
0a4dce78c1
Merge "Fix a11y readout of notification importance buttons" into qt-dev
...
am: 1b25f986cb
Change-Id: Ia42d67cab34dfb380d5be909f22f717f8ecfd5b6
2019-05-30 12:09:22 -07:00
TreeHugger Robot
1b25f986cb
Merge "Fix a11y readout of notification importance buttons" into qt-dev
2019-05-30 18:53:57 +00:00
Julia Reynolds
eeefeebeff
Change notification alert icon
...
Test: manual
Bug: 134054170
Change-Id: Ibd66a55a30ac9fbeb7a32638fe236067c6175bc4
2019-05-30 14:47:07 -04:00
Adam He
65a6dbc797
Merge "Profile select only shows with multiple profiles present." into qt-r1-dev
...
am: c9364bffbc
Change-Id: I4bdd3a802d57190815e274cdaf0b2909e4236432
2019-05-30 11:39:53 -07:00
TreeHugger Robot
c9364bffbc
Merge "Profile select only shows with multiple profiles present." into qt-r1-dev
2019-05-30 18:32:54 +00:00
Yi-Ling Chuang
d164bf2309
Merge "Load wallpaper colors in a background thread." into qt-dev
...
am: 7b332d981d
Change-Id: I97aea80bd414e26a443d549fcf0cdc93e07b58db
2019-05-30 11:24:31 -07:00
Yi-Ling Chuang
abccbcb23b
Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d
...
am: dd7133e523
Change-Id: Ic9c0446a211db1e9de2094fe5f13d30281a2508c
2019-05-30 11:20:43 -07:00
Yi-Ling Chuang
dd7133e523
Merge "Load wallpaper colors in a background thread." into qt-dev
...
am: 7b332d981d
Change-Id: I36b5b699bb4e844083fc2d9b269b1cfe311a3575
2019-05-30 11:18:03 -07:00
Lei Yu
2dd116845a
Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
...
am: 949c937fce
Change-Id: Ied1099bc8d4781e6b804e53cb04b61614543cb9a
2019-05-30 11:10:41 -07:00