Commit Graph

25974 Commits

Author SHA1 Message Date
Linda Tseng
f9316fe23d Merge "Remove divider above device switcher in panel" into qt-dev am: 3d46fcd5b4
am: 7d8e6d6fb9

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

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

Change-Id: I130711bcbe89e07cae2d95b228f922a0f93d46e3
2019-04-05 19:05:07 -07:00
Linda Tseng
7d8e6d6fb9 Merge "Remove divider above device switcher in panel" into qt-dev
am: 3d46fcd5b4

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

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

Change-Id: I105d8d47b22b777eee5b549f7c29b1e252895f39
2019-04-05 17:12:54 -07:00
Lei Yu
a038801ed6 Merge changes Ib80d68d6,I0d57d5b2 into qt-dev am: e323b40f4e
am: 83923e5cf0

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

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

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

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

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

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

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

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
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

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

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
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