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
Michael Groover
56de25a614
Use Settings instead of DeviceConfig to relax device ID dev option am: 9e3b3d77a2
...
am: 0542653372
2019-04-04 20:08:35 -07:00
Kevin Chyn
8911d73291
Merge changes from topic "face-profile-qt-dev" into qt-dev
...
am: 388295a80c
2019-04-04 18:53:50 -07:00
Kevin Chyn
cebeaf98f2
Add face profile settings
...
am: 39ca021586
2019-04-04 18:52:11 -07:00
Fan Zhang
c9d3a9fbfd
Merge "Add uri to custom slice PendingIntent." into qt-dev
...
am: f768b451c3
2019-04-04 18:50:10 -07:00
Fan Zhang
275a3a6d50
Merge "Update strings" into qt-dev
...
am: a4ea8e94a0
2019-04-04 18:30:52 -07:00
Michael Groover
0542653372
Use Settings instead of DeviceConfig to relax device ID dev option
...
am: 9e3b3d77a2
2019-04-04 18:13:02 -07:00
Kevin Chyn
388295a80c
Merge changes from topic "face-profile-qt-dev" into qt-dev
...
* changes:
Settings should be per-profile
Add face profile settings
2019-04-05 00:41:17 +00:00
TreeHugger Robot
f768b451c3
Merge "Add uri to custom slice PendingIntent." into qt-dev
2019-04-05 00:35:24 +00:00
TreeHugger Robot
a4ea8e94a0
Merge "Update strings" into qt-dev
2019-04-05 00:28:29 +00:00
Fan Zhang
459035a263
Add uri to custom slice PendingIntent.
...
Discovered flashlight slice sometimes does not work, throwing exception
similar as it b/117445451. Adding a data uri fixes it.
Bug: 129981692
Test: manual
Change-Id: I16bc19027dd342f85aaabbf1a2853bb55564f64f
2019-04-04 16:12:38 -07:00
Kevin Chyn
e596ba6863
Settings should be per-profile
...
Also, don't show keyguard option for work profile
Fixes: 129905061
Test: Builds
Change-Id: I18f573f39ee4e54a3385cc65079bb794633cc560
2019-04-04 15:39:00 -07:00
Michael Groover
9e3b3d77a2
Use Settings instead of DeviceConfig to relax device ID dev option
...
The 'Disable device identifier restrictions' developer option
currently uses DeviceConfig to set whether the new access
restrictions should be disabled. However this API now requires
the WRITE_DEVICE_CONFIG permission and should only be used from
the server side. This change modifies the developer option to use the
Settings to relax the device identifier check, and the option will
be hidden if the new restrictions have been disabled from the server.
Bug: 129888611
Test: Manually verified device ID check was relaxed with option
enabled. Also verified option is not displayed if DeiviceConfig
option is set.
Change-Id: Id8759f2219e702c1f93a638d45ac99bce685383b
(cherry picked from commit 60c80bb295
2019-04-04 22:14:17 +00:00
Jordan Liu
52ad6f0dcb
Merge "Make RadioInfo settings menu work for mSIM"
2019-04-04 20:33:31 +00:00
Kevin Chyn
39ca021586
Add face profile settings
...
Fixes: 110907543
Test: Builds
Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050
2019-04-04 13:18:04 -07:00
Fan Zhang
f2ec3cfbad
Update strings
...
Fixes: 129885706
Fixes: 129855545
Test: visual
Change-Id: I655655033c019de4365de9fe208c8c362134dfe3
2019-04-04 12:01:21 -07:00
Jordan Liu
77c522c7b1
Make RadioInfo settings menu work for mSIM
...
Just add a spinner to the top of the screen which lets you select the
phoneIndex. Upating this value updates the mTelephonyManager
mImsManager, and mPhoneStateListener to use the selected phoneIndex and
the subscription associated with it.
Also adds fields for current subId and default data sim subId.
Test: manual test (on single sim)
Fixes: 128033739
Change-Id: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
2019-04-04 11:21:51 -07:00
Lei Yu
bcdb4611ab
Merge "Customized Wifi calling text"
2019-04-04 17:13:37 +00:00
TreeHugger Robot
4ecca52827
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice"
2019-04-04 16:47:11 +00:00
TreeHugger Robot
650b3724c6
Merge "Update adaptive sleep setting with the latest copy"
2019-04-04 15:51:57 +00:00
Rich Cannings
40994b00af
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 5d9189fab2 -s ours am: 44427259e8
...
am: 4afd567d8d
2019-04-04 00:42:25 -07:00
Rich Cannings
4afd567d8d
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 5d9189fab2 -s ours
...
am: 44427259e8
2019-04-04 00:39:11 -07:00
Rich Cannings
b8c09d9bc2
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 34042bbf1d -s ours am: 2095ac82c4
...
am: 303429eb26
2019-04-04 00:37:12 -07:00
Rich Cannings
44427259e8
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
...
am: 5d9189fab2
2019-04-04 00:17:57 -07:00
Rich Cannings
303429eb26
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[] am: 34042bbf1d -s ours
...
am: 2095ac82c4
2019-04-04 00:13:15 -07:00
Rich Cannings
2095ac82c4
[automerger skipped] DO NOT MERGE Refactor passwords/pins/patterns to byte[]
...
am: 34042bbf1d
2019-04-03 23:56:43 -07:00
Rich Cannings
a620754b87
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 5d9189fab2
...
am: 3ac6fd041a
2019-04-03 19:44:21 -07:00
Rich Cannings
3ac6fd041a
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
...
am: 5d9189fab2
2019-04-03 19:13:43 -07:00
Christine Franks
0ffaf2ae25
Merge "Use CDS display white balance getter and setter"
2019-04-04 01:38:46 +00:00
Bill Rassieur
4cb74a9b54
Merge master@5428150 into git_qt-dev-plus-aosp.
...
am: 367625d5c1
2019-04-03 18:07:50 -07:00
Michael Groover
d1ead6d76c
Merge "Use Settings instead of DeviceConfig to relax device ID dev option"
2019-04-04 00:28:01 +00:00
Xiangyu/Malcolm Chen
14b8b27f1c
[automerger skipped] Merge "Clean up a few names of Telephony intent extra." am: 6bb737c5b9 am: 681bf8a664
...
am: 37683154b4f2fca31c51
2019-04-03 17:15:19 -07:00
Bill Rassieur
52ab4c895f
Merge master@5406228 into git_qt-dev-plus-aosp.
...
am: d09106b207
2019-04-03 16:59:32 -07:00
Xiangyu/Malcolm Chen
37683154b4
Merge "Clean up a few names of Telephony intent extra." am: 6bb737c5b9
...
am: 681bf8a664
2019-04-03 16:50:20 -07:00
Kevin Chyn
782b7f9919
Merge "Set/Get features with new interface"
2019-04-03 23:46:14 +00:00
Xiangyu/Malcolm Chen
681bf8a664
Merge "Clean up a few names of Telephony intent extra."
...
am: 6bb737c5b9
2019-04-03 16:25:05 -07:00
Xiangyu/Malcolm Chen
6bb737c5b9
Merge "Clean up a few names of Telephony intent extra."
2019-04-03 23:06:47 +00:00
jackqdyulei
acacaf44d3
Customized Wifi calling text
...
This only fixed in old page from aosp/777974. We need to migrate
it to new preference controller
Fixes: 117257109
Test: Manual
Change-Id: I257be10d7cc1fc4a91ee0df404dd69b4d2ee8ae2
2019-04-03 15:54:48 -07:00
Lei Yu
e4f64e5c0c
Merge "Move telephony method to worker thread"
2019-04-03 22:45:28 +00:00
jackqdyulei
6db1440a0a
Move telephony method to worker thread
...
Get bug complaining it blocks UI even though it works fine some devices.
This CL moves methods to worker thread and keep progressbar
shown at least for 1 second, to avoid janky UI.
Fixes: 129329645
Test: RunSettingsRoboTests
Change-Id: Iee51949b7f6dfe2ede0fc4e6cd0f7b96d7199081
2019-04-03 22:45:07 +00:00
Michael Groover
60c80bb295
Use Settings instead of DeviceConfig to relax device ID dev option
...
The 'Disable device identifier restrictions' developer option
currently uses DeviceConfig to set whether the new access
restrictions should be disabled. However this API now requires
the WRITE_DEVICE_CONFIG permission and should only be used from
the server side. This change modifies the developer option to use the
Settings to relax the device identifier check, and the option will
be hidden if the new restrictions have been disabled from the server.
Bug: 129888611
Test: Manually verified device ID check was relaxed with option
enabled. Also verified option is not displayed if DeiviceConfig
option is set.
Change-Id: Id8759f2219e702c1f93a638d45ac99bce685383b
2019-04-03 15:28:34 -07:00
Alex Salo
fdeb07c05b
Update adaptive sleep setting with the latest copy
...
Bug: 129352433
Change-Id: I3c9594f9ed49208ef1d7bbc33e8083a0c733b1f8
Test: manually confirmed it works and looks correct
2019-04-03 22:27:58 +00:00
Chen Xu
5a9f447300
Merge "SDK API doesSwitchModemConfigTriggerReboot"
2019-04-03 22:17:46 +00:00
TreeHugger Robot
d4f24dd9a9
Merge "Add tests for ContextualCardManager."
2019-04-03 22:07:38 +00:00
Kevin Chyn
856b34dabc
Set/Get features with new interface
...
Bug: 127382095
Test: Builds
Change-Id: Ideb252989a49eec88b8ee7f3ce6ea4f9d85bb3bc
2019-04-03 14:53:28 -07:00
TreeHugger Robot
3205d9405d
Merge "Add tests for ContextualCardsAdapter."
2019-04-03 21:17:45 +00:00
TreeHugger Robot
67c9f40278
Merge "Add a flashlight handler activity to support indexability."
2019-04-03 20:48:23 +00:00
