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
Bill Yi
a036310bba
[automerger skipped] Import translations. DO NOT MERGE am: 83d678bdc4 -s ours am: 37f00b2fce -s ours
...
am: 8c7320ebde
2019-04-05 20:37:50 -07:00
Mill Chen
555556b8ab
Merge "Update taskAffinity" into qt-dev am: 383baeae86
...
am: 0d1a64888d
2019-04-05 20:20:04 -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
Bill Yi
8c7320ebde
[automerger skipped] Import translations. DO NOT MERGE am: 83d678bdc4 -s ours
...
am: 37f00b2fce
2019-04-05 18:29:06 -07:00
Mill Chen
0d1a64888d
Merge "Update taskAffinity" into qt-dev
...
am: 383baeae86
2019-04-05 18:21:27 -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
Jordan Liu
5ab9a91b9b
resolve merge conflicts of 7d59c48038 to qt-dev-plus-aosp
...
am: 3a4412ff41
2019-04-05 16:29:31 -07: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
Bill Yi
37f00b2fce
[automerger skipped] Import translations. DO NOT MERGE
...
am: 83d678bdc4
2019-04-05 15:47:28 -07:00
TreeHugger Robot
383baeae86
Merge "Update taskAffinity" into qt-dev
2019-04-05 21:39:05 +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
Hall Liu
e0cd58a58f
[automerger skipped] Merge "Show the disclaimer for WFC emergency call limitation" am: 2188a0040a am: 2e5cc974dd -s ours
...
am: 4205d96b21ec20de3eba
2019-04-05 13:55:14 -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
Bill Yi
83d678bdc4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
2019-04-05 12:44:47 -07: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
83923e5cf0
Merge changes Ib80d68d6,I0d57d5b2 into qt-dev
...
am: e323b40f4e
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: 2e5cc974ddec20de3eba
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
2019-04-05 11:09:52 -07:00
Amin Shaikh
356c27769a
Merge "Add Settings icons needed for theme overlaying." into qt-dev
...
am: 41f0a69b76
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
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
Julia Reynolds
7bbf364829
Merge "Add bubble confirmation prompt" into qt-dev
...
am: 208c21d2c1
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
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
Salvador Martinez
17b8d553ce
Merge "Update wifi p2p to direct user to enable location" into qt-dev
...
am: f32d29b730
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
36b9d4286d
Merge "Cache attention toggle in settings" into qt-dev am: 13c1c27b8c
...
am: 2646300e43
2019-04-05 00:02:36 -07:00
Kevin Chyn
2646300e43
Merge "Cache attention toggle in settings" into qt-dev
...
am: 13c1c27b8c
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
e86909cffb
Merge "Match add network button width to master switch and tint it." into qt-dev am: 19626c24ec
...
am: 29870ede9c
2019-04-04 23:03:05 -07:00
Andrew Sapperstein
29870ede9c
Merge "Match add network button width to master switch and tint it." into qt-dev
...
am: 19626c24ec
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
85d2c13635
Merge "Add prompt to sign in at captive portal to Wi-Fi Slice" into qt-dev am: 973eff2eb2
...
am: f52939f2ee
2019-04-04 21:48:04 -07:00
jackqdyulei
3759e88ffc
Merge "Customized Wifi calling text" into qt-dev am: 83f60c81f5
...
am: 9cf6e8ddb3
2019-04-04 21:46:55 -07:00
Andrew Sapperstein
1d741097b1
Merge "Update char limit for reset_esim_title." into qt-dev am: 576d601032
...
am: 9c8deb8967
2019-04-04 21:36:12 -07:00
