Fan Zhang
d79636445e
Merge "Remove mainline module feature flag checks." into qt-dev am: 023fa7fdf9
...
am: 37017efb9c
2019-04-05 21:58:05 -07:00
Linda Tseng
f9316fe23d
Merge "Remove divider above device switcher in panel" into qt-dev am: 3d46fcd5b4
...
am: 7d8e6d6fb9
2019-04-05 20:53:22 -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
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
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
TreeHugger Robot
023fa7fdf9
Merge "Remove mainline module feature flag checks." into qt-dev
2019-04-05 23:33:16 +00:00
Lei Yu
a038801ed6
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev am: e323b40f4e
...
am: 83923e5cf0
2019-04-05 16:20:08 -07:00
Linda Tseng
3d46fcd5b4
Merge "Remove divider above device switcher in panel" into qt-dev
2019-04-05 23:09:14 +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
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
544f60909b
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request."
...
am: 11ce64450c
2019-04-05 11:09:52 -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
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
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
13c1c27b8c
Merge "Cache attention toggle in settings" into qt-dev
2019-04-05 06:33:37 +00: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
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
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
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
Kevin Chyn
cebeaf98f2
Add face profile settings
...
am: 39ca021586
2019-04-04 18:52:11 -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
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
Kevin Chyn
83f2836552
Cache attention toggle in settings
...
Bug: 129912479
Test: Builds
Change-Id: I23017f37d53e162c1a1ec35570355508276f90fa
2019-04-04 17:24:09 -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
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
2019-04-04 15:03:03 -07:00
Hall Liu
2e5cc974dd
Merge "Show the disclaimer for WFC emergency call limitation"
...
am: 2188a0040a
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
