Mill Chen
555556b8ab
Merge "Update taskAffinity" into qt-dev am: 383baeae86
...
am: 0d1a64888d
2019-04-05 20:20:04 -07:00
Mill Chen
ec881bb3d6
Merge "Fix sending broadcast with a qualified user in Settings" into qt-dev am: b8808e35a6
...
am: 765b020c5a
2019-04-05 19:06:08 -07:00
Lei Yu
f0aa999bd2
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." am: 11ce64450c am: 544f60909b
...
am: c513381245
2019-04-05 19:05:07 -07: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
Jordan Liu
5ab9a91b9b
resolve merge conflicts of 7d59c48038 to qt-dev-plus-aosp
...
am: 3a4412ff41
2019-04-05 16:29:31 -07:00
Lei Yu
a038801ed6
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev am: e323b40f4e
...
am: 83923e5cf0
2019-04-05 16:20:08 -07:00
TreeHugger Robot
383baeae86
Merge "Update taskAffinity" into qt-dev
2019-04-05 21:39:05 +00:00
Hall Liu
e0cd58a58f
[automerger skipped] Merge "Show the disclaimer for WFC emergency call limitation" am: 2188a0040a am: 2e5cc974dd -s ours
...
am: 4205d96b21ec20de3eba
2019-04-05 13:55:14 -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
Amin Shaikh
3d4928fb8e
Merge "Add Settings icons needed for theme overlaying." into qt-dev am: 41f0a69b76
...
am: 356c27769a
2019-04-05 11:58:18 -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
Lei Yu
11ce64450c
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request."
2019-04-05 17:36:54 +00:00
Mill Chen
6b2bced1e6
Fix sending broadcast with a qualified user in Settings
...
Fixes: 118387886
Test: rebotests
Change-Id: I9e0bdd708b7c95f785f2b11d6d7e3f7818234ada
2019-04-05 10:35:54 -07:00
Julia Reynolds
5ce8bf1f72
Merge "Add bubble confirmation prompt" into qt-dev am: 208c21d2c1
...
am: 7bbf364829
2019-04-05 10:13:20 -07:00
Lei Yu
e323b40f4e
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev
...
* changes:
Init PowerWhitelistbackend to stop crash
Create gitignore for Settings
2019-04-05 17:11:34 +00:00
TreeHugger Robot
41f0a69b76
Merge "Add Settings icons needed for theme overlaying." into qt-dev
2019-04-05 16:38:08 +00:00
Julia Reynolds
7bbf364829
Merge "Add bubble confirmation prompt" into qt-dev
...
am: 208c21d2c1
2019-04-05 08:51:37 -07:00
TreeHugger Robot
208c21d2c1
Merge "Add bubble confirmation prompt" into qt-dev
2019-04-05 15:26:24 +00:00
Julia Reynolds
19e2473bed
Add bubble confirmation prompt
...
@ the app level if the global level is off
Test: robotests
Bug: 129068779
Change-Id: I94acb334dc9879cd372a2a0dfa8e9508fbf1c316
2019-04-05 09:31:30 -04:00
Amin Shaikh
7b7d6888a2
Add Settings icons needed for theme overlaying.
...
- Refactor battery icons to remove private attributes to allow them to
be overlayed
- Add drawable icon in settings for back arrow
- Update a few GM2 icons
Bug: 128354921
Test: make; open Settings
Change-Id: I84151a4e7d787381b6c51f02bb45ce5f15fa37a2
2019-04-05 07:54:07 -04:00
Salvador Martinez
b86b83b4a3
Merge "Update wifi p2p to direct user to enable location" into qt-dev am: f32d29b730
...
am: 17b8d553ce
2019-04-05 01:27:30 -07:00
Salvador Martinez
17b8d553ce
Merge "Update wifi p2p to direct user to enable location" into qt-dev
...
am: f32d29b730
2019-04-05 01:15:42 -07:00
TreeHugger Robot
f32d29b730
Merge "Update wifi p2p to direct user to enable location" into qt-dev
2019-04-05 07:59:44 +00:00
Kevin Chyn
36b9d4286d
Merge "Cache attention toggle in settings" into qt-dev am: 13c1c27b8c
...
am: 2646300e43
2019-04-05 00:02:36 -07:00
Kevin Chyn
2646300e43
Merge "Cache attention toggle in settings" into qt-dev
...
am: 13c1c27b8c
2019-04-04 23:52:52 -07:00
Kevin Chyn
13c1c27b8c
Merge "Cache attention toggle in settings" into qt-dev
2019-04-05 06:33:37 +00:00
Andrew Sapperstein
e86909cffb
Merge "Match add network button width to master switch and tint it." into qt-dev am: 19626c24ec
...
am: 29870ede9c
2019-04-04 23:03:05 -07:00
Andrew Sapperstein
29870ede9c
Merge "Match add network button width to master switch and tint it." into qt-dev
...
am: 19626c24ec
2019-04-04 22:53:07 -07:00
TreeHugger Robot
19626c24ec
Merge "Match add network button width to master switch and tint it." into qt-dev
2019-04-05 05:35:05 +00:00
Jason Chiu
85d2c13635
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev am: 973eff2eb2
...
am: f52939f2ee
2019-04-04 21:48:04 -07:00
jackqdyulei
3759e88ffc
Merge "Customized Wifi calling text" into qt-dev am: 83f60c81f5
...
am: 9cf6e8ddb3
2019-04-04 21:46:55 -07:00
Andrew Sapperstein
1d741097b1
Merge "Update char limit for reset_esim_title." into qt-dev am: 576d601032
...
am: 9c8deb8967
2019-04-04 21:36:12 -07:00
Fan Zhang
965de4aadd
Merge "DND should be displayed on search as slice." into qt-dev am: b05af56a64
...
am: 6302195a6b
2019-04-04 21:15:56 -07:00
Alex Salo
8df29b2584
Merge "Update adaptive sleep setting with the latest copy" into qt-dev am: 02576b6e2e
...
am: f2dfd87b21
2019-04-04 20:58:52 -07:00
Jason Chiu
f52939f2ee
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev
...
am: 973eff2eb2
2019-04-04 20:27:39 -07:00
jackqdyulei
9cf6e8ddb3
Merge "Customized Wifi calling text" into qt-dev
...
am: 83f60c81f5
2019-04-04 20:24:58 -07:00
Andrew Sapperstein
9c8deb8967
Merge "Update char limit for reset_esim_title." into qt-dev
...
am: 576d601032
2019-04-04 20:20:57 -07:00
TreeHugger Robot
973eff2eb2
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev
2019-04-05 03:19:22 +00:00
Fan Zhang
6302195a6b
Merge "DND should be displayed on search as slice." into qt-dev
...
am: b05af56a64
2019-04-04 20:18:58 -07:00
TreeHugger Robot
83f60c81f5
Merge "Customized Wifi calling text" into qt-dev
2019-04-05 03:17:18 +00:00
Kevin Chyn
588f2dc724
Merge changes from topic "face-profile-qt-dev" into qt-dev am: 388295a80c
...
am: 8911d73291
2019-04-04 20:11:48 -07:00
Kevin Chyn
1c2812519b
Add face profile settings am: 39ca021586
...
am: cebeaf98f2
2019-04-04 20:11:01 -07:00
Fan Zhang
5ffd085c10
Merge "Add uri to custom slice PendingIntent." into qt-dev am: f768b451c3
...
am: c9d3a9fbfd
2019-04-04 20:10:15 -07:00
Fan Zhang
4313901bec
Merge "Update strings" into qt-dev am: a4ea8e94a0
...
am: 275a3a6d50
2019-04-04 20:09:27 -07:00
