Commit Graph

8678 Commits

Author SHA1 Message Date
Antony Sargent
bffd3757e0 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -07:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
Lei Yu
68c81d5b79 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
am: 1fa5118618

Change-Id: Icf8db899a7e0f68082e6eaf61f3f1541d456d880
2019-06-03 10:15:47 -07:00
Lei Yu
1fa5118618 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 057dc8466a

Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b
2019-06-03 10:08:14 -07:00
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
Amin Shaikh
5d8b1b3cc5 Update Settings overlayed icons.
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.

Bug: 131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
2019-06-03 12:26:11 -04:00
Fan Zhang
aa08a2cc0e Use slice uri from slice index db directly.
During SettingsSliceProvider#onGetSliceDescendants, use the uris from
database directly instead of getting the key and construct the uris
manually.

Bug: 126222433
Test: robotest
Change-Id: Iad4e9fc28ec4442b6bb323878503d743582b35ac
2019-05-31 16:03:33 -07:00
Joel Galenson
9e05bf902a Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
am: efbf351167

Change-Id: Ib2dd0082d7b4b8d4d38fd6b3fdaa1c43eb94a69a
2019-05-31 15:34:06 -07: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
793cb2c9c7 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: c4be5512a7
am: ecf3028123

Change-Id: I90f792dd3f24533411deafd15988b70278a7fd27
2019-05-31 14:43:50 -07: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
09c60c349f Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
am: a22bf1cd8b

Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3
2019-05-31 11:10:26 -07:00
TreeHugger Robot
75a5ef8c16 Merge "Override 2 getSliceUri() instance to return platform slice" 2019-05-31 18:03:44 +00: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
5a9c0f861e Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
am: 0709624634

Change-Id: I9ebf8ab89c1bd7cdbb0f46df75cd842dc50a3bee
2019-05-31 06:17:32 -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
TreeHugger Robot
c0fbb533d2 Merge "Guard NPE when using search view" 2019-05-31 04:27:43 +00:00
Colin Cross
dc67600f18 Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d am: 2d7cf1d924
am: cde28793cd

Change-Id: I83e1cf3c191023b056c7f20e0f31577fd311e7ca
2019-05-30 20:46:28 -07:00
Colin Cross
cde28793cd Merge "Make test_options.timeout an int64" am: c56651b345 am: 001b1c556d
am: 2d7cf1d924

Change-Id: I17cd8ae5326176f8451fd81af0d468326403a9ed
2019-05-30 20:28:58 -07:00
Colin Cross
2d7cf1d924 Merge "Make test_options.timeout an int64" am: c56651b345
am: 001b1c556d

Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6
2019-05-30 20:24:25 -07:00
tmfang
f841748be3 Guard NPE when using search view
Test: This crash pattern was observed from monkey test, I can't reproduce it.
So, just rebuild rom.
Fixes: 132819226

Change-Id: I0726524dcf8e1622d64f75c17b3600a7440b58c2
2019-05-31 10:47:30 +08:00
Fan Zhang
ec81d6121e Override 2 getSliceUri() instance to return platform slice
Bug: 126222433
Test: robotest
Change-Id: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
2019-05-30 16:50:43 -07:00
Fan Zhang
f36ca50ec7 Add slice uri to slice index db
And slightly refactored the SliceDataConverter to remove 1 reflection.

Bug: 126222433
Test: robotest
Change-Id: Ic5782bdd71f5c9cb77879a35de81dc61c01d1912
2019-05-30 16:47:31 -07:00
Alex Salo
88e3adce68 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7
am: ac7851e1ce

Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
2019-05-30 16:31:17 -07: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
Christine Franks
2adf1f213d Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d
am: 3ccc01ca18

Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b
2019-05-30 14:09:41 -07: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
Lei Yu
ebdca63be8 Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d am: 949c937fce
am: 2dd116845a

Change-Id: I8f7c3467362d2e4662c0a7ad9649a2b1ab505c07
2019-05-30 11:44:04 -07:00
Colin Cross
02ce47c2a1 Make test_options.timeout an int64
Test: m RunSettingsRoboTests
Change-Id: I979268540fb50a22316223f432d3c6cbb259f61a
2019-05-30 11:32:07 -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