Bill Yi
b8678ee1e4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 00846385a5
2019-04-08 17:14:23 -07:00
TreeHugger Robot
00846385a5
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-08 23:37:53 +00:00
Xiangyu/Malcolm Chen
9106454fbd
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
...
am: 81f31ef4d3
2019-04-08 15:09:40 -07:00
Lei Yu
afffd04568
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
...
am: 8f45be526d
2019-04-08 15:08:04 -07:00
Xiangyu/Malcolm Chen
81f31ef4d3
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
2019-04-08 21:38:25 +00:00
Lei Yu
8f45be526d
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
2019-04-08 21:28:09 +00:00
Andrew Sapperstein
4bbd1e867b
Merge "Delete carrier entry from mobile network details page." into qt-dev
...
am: b93761d252
2019-04-08 14:04:11 -07:00
Bill Yi
ef1e217daf
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0ee949c0948860c8a6834fc3b63fa0d9175cfb0
2019-04-08 13:57:43 -07:00
TreeHugger Robot
b93761d252
Merge "Delete carrier entry from mobile network details page." into qt-dev
2019-04-08 20:00:29 +00:00
Antony Sargent
da62a42ef8
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev
...
am: 5c28e42538
2019-04-08 11:43:38 -07:00
Malcolm Chen
046419a92a
Revert switchBar if enable / disable subscription fails.
...
Bug: 123321718
Test: build manual test
Change-Id: Ia7e8c762d91f81b67e0d0b11d36dfa78ec1e2d18
2019-04-08 18:42:06 +00:00
Sumit Deshmukh
c00e137a55
Settings: [BT] Wrong Pairing Popup is shown on new pairing request.
...
Usecase:
1. Start advertising from DUT (using BLE Smartertooth app).
2. Scan and connect from central device.
3. Now initiate bond from central and accept pairing request.
(Consent Pairing Dialog will be shown on DUT)
4. Notification will be received for PASSKEY CONFIRMATION Dialog.
Do not open notification and let it timeout.
5. Repeat steps 2 and 3. At step 3, Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.
Issue:
Wrong Pairing Popup is shown. Passkey Confirmation pairing
dialog is show instead of Consent pairing dialog.
Reproducible Rate: 100%
Root Cause:
PendingIntent created for showing pairing notification are getting
reused as only FLAG_ONE_SHOT is used. This flag is not updating new
extra's in the pending intent.
Fix:
Use flag FLAG_UPDATE_CURRENT in pending Intent.
Test: Tested above mentioned testcase and pairing scenarios.
Fix: 129479787
Bug: 129456113
Change-Id: I46813f355cd796cee1b472774b494c8580b39784
2019-04-08 18:20:36 +00:00
TreeHugger Robot
5c28e42538
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev
2019-04-08 18:15:57 +00:00
Andrew Sapperstein
95c915d9dc
Delete carrier entry from mobile network details page.
...
Followup CL will need to delete the backing code after we remove the feature flag.
Bug: 127540176
Test: robotests and visual inspection
Change-Id: I17e917b9726cf7f5470af09332ede38f8c253eed
2019-04-08 11:15:47 -07:00
Amin Shaikh
3c77da98ca
Merge "Fix battery color tint issue." into qt-dev
...
am: f1cea95f3e
2019-04-08 08:37:21 -07:00
Svetoslav Ganov
7b5fe13e0c
Merge "Update Settings to use the proper DeviceConfig API." into qt-dev
...
am: d5161f8d90
2019-04-08 08:20:14 -07:00
TreeHugger Robot
f1cea95f3e
Merge "Fix battery color tint issue." into qt-dev
2019-04-08 15:03:58 +00:00
Svetoslav Ganov
d5161f8d90
Merge "Update Settings to use the proper DeviceConfig API." into qt-dev
2019-04-08 14:54:03 +00:00
tmfang
f8a56930b6
Improve launch time for app & notification screen
...
am: e9f11d6efc
2019-04-08 04:14:45 -07:00
tmfang
e9f11d6efc
Improve launch time for app & notification screen
...
- We won't query recent apps in getAvailabilityStatus().
And then we do that in background thread.
So, we can launch app & notificatins screen as soon as possible.
- Create a RecentAppStatsMixin class which is responsible
for maintaining the recent apps data.
- Controllers and fragment update their UI after they got
onReloadDataCompleted callback from RecentAppStatsMixin.
Test: manual, robotest
Fixes: 128849426
Fixes: 126453868
Change-Id: I636d5878cb5d53496978fe613c625382d8d382bc
2019-04-08 16:40:33 +08:00
Svet Ganov
864765f8b4
Update Settings to use the proper DeviceConfig API.
...
Exempt-From-Owner-Approval: carry over approval from ag/6908306
bug:124769181
Change-Id: If18d0dc5e55dabf82b7c7a2b6df240fb8b24f736
2019-04-07 22:37:02 -07:00
Antony Sargent
bc0affa980
Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev
...
am: 6010c3a9a8
2019-04-05 21:16:32 -07:00
TreeHugger Robot
6010c3a9a8
Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev
2019-04-06 04:05:32 +00:00
Christine Franks
b4a96145bb
Merge "Use CDS display white balance getter and setter" into qt-dev
...
am: 65b535f44a
2019-04-05 20:43:37 -07:00
Fan Zhang
0e89993b47
Merge "Clean up tts preference layout." into qt-dev
...
am: 963ebf576a
2019-04-05 19:34:15 -07:00
Fan Zhang
37017efb9c
Merge "Remove mainline module feature flag checks." into qt-dev
...
am: 023fa7fdf9
2019-04-05 19:02:12 -07:00
Linda Tseng
7d8e6d6fb9
Merge "Remove divider above device switcher in panel" into qt-dev
...
am: 3d46fcd5b4
2019-04-05 18:42:43 -07:00
Bill Yi
8c7320ebde
[automerger skipped] Import translations. DO NOT MERGE am: 83d678bdc4 -s ours
...
am: 37f00b2fce
2019-04-05 18:29:06 -07:00
Christine Franks
65b535f44a
Merge "Use CDS display white balance getter and setter" into qt-dev
2019-04-06 01:25:41 +00:00
Mill Chen
0d1a64888d
Merge "Update taskAffinity" into qt-dev
...
am: 383baeae86
2019-04-05 18:21:27 -07:00
Mill Chen
765b020c5a
Merge "Fix sending broadcast with a qualified user in Settings" into qt-dev
...
am: b8808e35a6
2019-04-05 17:50:29 -07:00
Lei Yu
c513381245
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." am: 11ce64450c
...
am: 544f60909b
2019-04-05 17:12:54 -07:00
Amin Shaikh
95aeb373fd
Fix battery color tint issue.
...
Added test to verify fix.
Bug: 128354921
Test: m RunSettingsRoboTests
Change-Id: I24cbb966e549eec783912e4e118c00425b971ad0
2019-04-05 23:52:59 +00:00
Antony Sargent
ed5c2a1b10
Don't allow CBRS subscriptions to be set as default for Calls/SMS
...
CBRS subscriptions (also known as "opportunistic" in the code base) are
data-only and it should not be possible to try to set them as the
default for Calls or SMS.
Fixes: 125855327
Test: make RunSettingsRoboTests
Change-Id: Ie20ef21ccc7b27315089f6a61cceb6e1512ec373
2019-04-05 16:48:53 -07:00
TreeHugger Robot
963ebf576a
Merge "Clean up tts preference layout." into qt-dev
2019-04-05 23:36:07 +00:00
TreeHugger Robot
023fa7fdf9
Merge "Remove mainline module feature flag checks." into qt-dev
2019-04-05 23:33:16 +00:00
Linda Tseng
3d46fcd5b4
Merge "Remove divider above device switcher in panel" into qt-dev
2019-04-05 23:09:14 +00:00
Bill Yi
37f00b2fce
[automerger skipped] Import translations. DO NOT MERGE
...
am: 83d678bdc4
2019-04-05 15:47:28 -07:00
TreeHugger Robot
383baeae86
Merge "Update taskAffinity" into qt-dev
2019-04-05 21:39:05 +00:00
Christine Franks
84e67e1f72
Use CDS display white balance getter and setter
...
Bug: 123930917
Test: make ROBOTEST_FILTER="(DisplayWhite*)" RunSettingsRoboTests -j48
Change-Id: Iafc6ff9a61b69baf03efddd52687093c55d35178
(cherry picked from commit ebacc33852
2019-04-05 21:36:34 +00:00
Fan Zhang
d8b316f816
Remove mainline module feature flag checks.
...
They are turned on for a while now.
Fixes: 123648279
Test: robotests
Change-Id: Ibec7a10d49387207697635190a237807f1807628
2019-04-05 14:31:04 -07:00
lindatseng
cf93c8bc92
Remove divider above device switcher in panel
...
Remove the divider above the media device switcher Slice per the request.
Do a little refactor in Panel View, to use DividerItemDecoration instead of adding
divider views in layout file as the recycler view items divider.
Since dividers should be shown in most cases, we are setting DividerCondition to
DIVIDER_CONDITION_BOTH and default true to allow divider. For the slice we don't
need divider (media device switch in this case) we are setting the the target
direction of isDividerAllowed (above in this case) to false. Since we have
DIVIDER_CONDITION_BOTH, if one of the item view set the divider not allow, the
divider won't be shown.
Test: Visual/Manual inspection
Fixes: 126205139
Change-Id: Ic857705c90819ef9375f877a44bb32987b5d4438
2019-04-05 14:15:16 -07:00
Fan Zhang
5bb4ef7c45
Clean up tts preference layout.
...
Deleted the custom tts layout and use preference_radio directly.
Fixes: 129994473
Test: visual
Change-Id: Ifc50e0cf9f805776e0529ffd5d672283f28a1d15
2019-04-05 13:44:37 -07:00
Jordan Liu
3a4412ff41
resolve merge conflicts of 7d59c48038 to qt-dev-plus-aosp
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ida3890ed8a15cd50cc993fc9e5e0dd5976088cd3
2019-04-05 13:31:11 -07:00
TreeHugger Robot
b8808e35a6
Merge "Fix sending broadcast with a qualified user in Settings" into qt-dev
2019-04-05 20:05:40 +00:00
Bill Yi
83d678bdc4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
2019-04-05 12:44:47 -07:00
Lei Yu
83923e5cf0
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev
...
am: e323b40f4e
2019-04-05 11:54:51 -07:00
Hall Liu
4205d96b21
[automerger skipped] Merge "Show the disclaimer for WFC emergency call limitation" am: 2188a0040a
...
am: 2e5cc974ddec20de3eba
2019-04-05 11:19:06 -07:00
Lei Yu
544f60909b
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request."
...
am: 11ce64450c
2019-04-05 11:09:52 -07:00
Amin Shaikh
356c27769a
Merge "Add Settings icons needed for theme overlaying." into qt-dev
...
am: 41f0a69b76
2019-04-05 10:52:54 -07:00
