Lei Yu
83923e5cf0
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev
...
am: e323b40f4e
Change-Id: I075838c02b91c4d73f12f5f513fec89cad5511b9
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: 2e5cc974dd
-s ours
am skip reason: change_id I881d479c1e02525ac614c66594637a5e0347d70c with SHA1 ec20de3eba
is in history
Change-Id: Ifa5e5c289c888c257af09121f1b1c431368113f1
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
Change-Id: I1bf0ed7400e556f8f8f6ad3e7a4b58b383a67034
2019-04-05 11:09:52 -07:00
Amin Shaikh
356c27769a
Merge "Add Settings icons needed for theme overlaying." into qt-dev
...
am: 41f0a69b76
Change-Id: I1cc1af6fd6e7850ca57192f4d61514edfc51b081
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
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
Change-Id: I10af264e70f24f19403d2a75e78acef699e2cb1c
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
17b8d553ce
Merge "Update wifi p2p to direct user to enable location" into qt-dev
...
am: f32d29b730
Change-Id: Idb9a590747676b21f5636bdfd6ac02521d3facdf
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
2646300e43
Merge "Cache attention toggle in settings" into qt-dev
...
am: 13c1c27b8c
Change-Id: If7add23abcfcbdbe77886d7d7716763f91008df7
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
29870ede9c
Merge "Match add network button width to master switch and tint it." into qt-dev
...
am: 19626c24ec
Change-Id: I733482a8f1ec024068e06f6f55632b200919e440
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
f52939f2ee
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev
...
am: 973eff2eb2
Change-Id: I1096c318ceecccadb63cecfb50008697987cd44a
2019-04-04 20:27:39 -07:00
jackqdyulei
9cf6e8ddb3
Merge "Customized Wifi calling text" into qt-dev
...
am: 83f60c81f5
Change-Id: I9b052ee41bbcdbc3289a28a06567518e56ec05ea
2019-04-04 20:24:58 -07:00
Andrew Sapperstein
9c8deb8967
Merge "Update char limit for reset_esim_title." into qt-dev
...
am: 576d601032
Change-Id: Ia284c8ddc50f663b830fc58c0e319f055998eeba
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
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
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
Kevin Chyn
39ca021586
Add face profile settings
...
Fixes: 110907543
Test: Builds
Change-Id: I9761f289bb250c5d9f5b5e75cf682d164c591050
2019-04-04 13:18:04 -07:00