Commit Graph

51312 Commits

Author SHA1 Message Date
Fan Zhang
6302195a6b Merge "DND should be displayed on search as slice." into qt-dev
am: b05af56a64

Change-Id: Idf7e940b22cd2cae697afbcb0979cc804fe7cdc1
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

Change-Id: Ifb86169d949878dc8a8d0e03752d8d8a680aaa1b
2019-04-04 20:11:48 -07:00
Kevin Chyn
1c2812519b Add face profile settings am: 39ca021586
am: cebeaf98f2

Change-Id: I32fc5b177e5b537674511e7b1e33638a035e3ffa
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

Change-Id: I8c8e4a87a03c2a766cb42679851c15ab837e5d60
2019-04-04 20:10:15 -07:00
Fan Zhang
4313901bec Merge "Update strings" into qt-dev am: a4ea8e94a0
am: 275a3a6d50

Change-Id: I4534fc6c39bcc8c6db63dd1fdf035d00008e50bf
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

Change-Id: Ib1bbe5a482424926c5bd653ef3b2f156ee99fd69
2019-04-04 20:08:35 -07:00
TreeHugger Robot
576d601032 Merge "Update char limit for reset_esim_title." into qt-dev 2019-04-05 03:07:09 +00:00
Fan Zhang
b05af56a64 Merge "DND should be displayed on search as slice." into qt-dev 2019-04-05 02:53:12 +00:00
Stanley Wang
bae490bc85 DND should be displayed on search as slice.
Add ZenModeSoundSettingsPreferenceController extends ZenModePreferenceController,
and update availability status to AVAILABLE.

This is cherry-picked from ag/6897872

Change-Id: I8dcb6808cc21c4f5c06548a363c998e369646487
Bug: 129320642
Test: manual & robotests
2019-04-05 02:53:04 +00:00
Alex Salo
f2dfd87b21 Merge "Update adaptive sleep setting with the latest copy" into qt-dev
am: 02576b6e2e

Change-Id: I04efc7f8d3c052d7ce2627188190f2dd9e76b0b1
2019-04-04 19:23:08 -07:00
Kevin Chyn
8911d73291 Merge changes from topic "face-profile-qt-dev" into qt-dev
am: 388295a80c

Change-Id: I1ce1eb796113c4f106d63a5a55f32dfb56c761aa
2019-04-04 18:53:50 -07:00
Kevin Chyn
cebeaf98f2 Add face profile settings
am: 39ca021586

Change-Id: I218b2cfbfc123a591774bdeb77faa46fd5d36e20
2019-04-04 18:52:11 -07:00
Fan Zhang
c9d3a9fbfd Merge "Add uri to custom slice PendingIntent." into qt-dev
am: f768b451c3

Change-Id: Id8ed81d56b4e131995583846677adb4f99159f49
2019-04-04 18:50:10 -07:00
Fan Zhang
275a3a6d50 Merge "Update strings" into qt-dev
am: a4ea8e94a0

Change-Id: I98adc0b17087954fa8bb913ce4a99a3e9743c01e
2019-04-04 18:30:52 -07:00
TreeHugger Robot
02576b6e2e Merge "Update adaptive sleep setting with the latest copy" into qt-dev 2019-04-05 01:16:23 +00:00
Michael Groover
0542653372 Use Settings instead of DeviceConfig to relax device ID dev option
am: 9e3b3d77a2

Change-Id: Ib2338724fcbf2cba26f8305499c547a84f445fdf
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
Kevin Chyn
83f2836552 Cache attention toggle in settings
Bug: 129912479

Test: Builds
Change-Id: I23017f37d53e162c1a1ec35570355508276f90fa
2019-04-04 17:24:09 -07:00
Andrew Sapperstein
d8516430ce Match add network button width to master switch and tint it.
It's now tinted in colorAccent.

Created a new default 80dp minWidth for TwoTargetPreferences.

Fixes: 129007966
Test: visual inspection
Change-Id: Ie751fe685d25373c3aac001e6e0daee8e18b9314
2019-04-04 17:22:10 -07:00
Salvador Martinez
d25ba81028 Update wifi p2p to direct user to enable location
Location is required for Wifi Direct so if it is not enabled
we disable the preference. Additionally, this fixes some minor
update issues in Wifi Wakeup that was also affecting wifi p2p.
Basically they weren't updating when location settings changed
until you left the screen and came back. Now they do.

Test: robotests, manual
Bug: 120552223
Change-Id: Ibd386fcfbef881cae3d871152675f1cab5e4a041
2019-04-04 23:45:04 +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
Mill Chen
078af3396f Update taskAffinity
To make sure Settings won't open unexpectedly.

Fixes: 129330530
Test: visual
Change-Id: Iaa0e0a6a03720b1a0be49d0e1f752d3a7164f4a2
2019-04-04 15:57: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
7d59c48038 Merge "Make RadioInfo settings menu work for mSIM"
am: a85fa6c51d

Change-Id: I0c83baafa8d30638b26c5dce3f23c722d3628991
2019-04-04 15:03:03 -07:00
Hall Liu
2e5cc974dd Merge "Show the disclaimer for WFC emergency call limitation"
am: 2188a0040a

Change-Id: I51288ccdd1cee609ed5e6f159a7c4d6fc144d092
2019-04-04 14:59:19 -07:00
Treehugger Robot
a85fa6c51d Merge "Make RadioInfo settings menu work for mSIM" 2019-04-04 21:56:10 +00:00
Hall Liu
2188a0040a Merge "Show the disclaimer for WFC emergency call limitation" 2019-04-04 21:40:34 +00:00
Lei Yu
033fe6eec0 Init PowerWhitelistbackend to stop crash
Also update text to "unavailable" to reflect its current status.

Fixes: 129955147
Test: Manual
Change-Id: Ib80d68d6d2b6bc4ced4a72483859e675b7e7e61c
2019-04-04 13:44:45 -07: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
Lei Yu
254afc0da0 Create gitignore for Settings
Fixes: 129973953
Test: Manual
Change-Id: I0d57d5b2fe161d150605854cbe7fe62494390a3e
2019-04-04 12:49:15 -07:00
Fan Zhang
f2ec3cfbad Update strings
Fixes: 129885706
Fixes: 129855545
Test: visual
Change-Id: I655655033c019de4365de9fe208c8c362134dfe3
2019-04-04 12:01:21 -07:00
Alex Salo
e0c9d3c474 Update adaptive sleep setting with the latest copy
Bug: 129352433
Change-Id: I3c9594f9ed49208ef1d7bbc33e8083a0c733b1f8
Test: manually confirmed it works and looks correct
(cherry picked from commit fdeb07c05b)
2019-04-04 18:55:59 +00: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
Jordan Liu
b69e8f2615 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
Fixes: 128033739
Change-Id: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
Merged-In: Id075e3bffe20523d8ceeb8f2e4320f995abdab55
2019-04-04 10:54:53 -07:00
Kevin Chyn
eeca918ac7 ConfirmDeviceCredential should respond to cancel when launched through BP
Fixes: 128747871

Test: BiometricPrompt launched by ConfirmDeviceCredential is canceled
Test: ConfirmLock* can also now be canceled
Test: No effect on non-biometric related paths

Change-Id: I237de136e63d523fece87fad7a93f4ecd66d800b
2019-04-04 17:22:23 +00:00
Antony Sargent
24aa3b3504 Fix 'Advanced' collapse point on Network & internet page
On the Network & internet page, we want to collapse all the prefs into
'Advanced' that appear after 'Data Saver'. The mechanism for specifying
where the collapse point starts is just a static count, and it doesn't
really understand the concept of dynamically added preferences like the
ones we add at the top when the device is in DSDS mode. To fix this in
the short term, this CL makes the header that manages these prefs
manually adjust the count as needed. In the future we'd like to have a
better mechanism for this added in the support library.

Fixes: 128855968
Test: make RunSettingsRoboTests
Change-Id: I4509726ff29bc71e1f0b3d4a2f60dffe4b1dd7ac
2019-04-04 10:21:24 -07:00
jackqdyulei
c833ee74ca 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
(cherry picked from commit acacaf44d3)
2019-04-04 17:15:59 +00:00
Lei Yu
bcdb4611ab Merge "Customized Wifi calling text" 2019-04-04 17:13:37 +00:00
Jason Chiu
8f6c06974c Add prompt to sign in at captive portal to Wi-Fi Slice
- Support signing in captive portal APs in WifiSlice
- Show ContextualWifiSlice when signing in is required
- Generifies SliceBackgroundWorker.getInstance() to return <T extends SliceBackgroundWorker>

Fixes: 128056349
Test: make RunSettingsRoboTests -j
Change-Id: Ib4d3942591a65e81018389e4c0bbddfea6854dbc
(cherry picked from commit dd9f92280b)
2019-04-04 16:51:02 +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
Andrew Sapperstein
7b3734e129 Update char limit for reset_esim_title.
Fixes: 129711512
Test: verified manually with larger string.
Change-Id: I802ed901ad65d79dbe761929467607f5e783be9e
2019-04-04 16:16:07 +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 -s ours
am skip reason: subject contains skip directive

Change-Id: I0734c123fb365bccad8bdd124ada568e46e963d3
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

Change-Id: I6dd5016aa9636457b740f92f3770e5b5a69d4c78
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 -s ours
am skip reason: subject contains skip directive

Change-Id: I8b275f8c7e6fc3bd9a86c0a442aba3009521cc6f
2019-04-04 00:37:12 -07:00