cosmohsieh
9f8522565a
Implement context menu for ConnectedAccessPointPreference
...
1) User wants to long press ConnectedAccessPointPreference to forget network if this
is a captive portal network.
2) Change context menu string
Bug: 113756562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: If5c45c45fe126f627eeb53a6c1873a070ad23ae8
2019-04-09 10:17:20 +08:00
Antony Sargent
2858c05963
Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev am: 6010c3a9a8
...
am: bc0affa980
2019-04-05 22:55:36 -07:00
Christine Franks
8807312990
Merge "Use CDS display white balance getter and setter" into qt-dev am: 65b535f44a
...
am: b4a96145bb
2019-04-05 22:36:53 -07:00
Fan Zhang
6a2e90f0e3
Merge "Clean up tts preference layout." into qt-dev am: 963ebf576a
...
am: 0e89993b47
2019-04-05 22:26:17 -07:00
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
Antony Sargent
bc0affa980
Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev
...
am: 6010c3a9a8
2019-04-05 21:16:32 -07:00
TreeHugger Robot
6010c3a9a8
Merge "Don't allow CBRS subscriptions to be set as default for Calls/SMS" into qt-dev
2019-04-06 04:05:32 +00: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
Christine Franks
b4a96145bb
Merge "Use CDS display white balance getter and setter" into qt-dev
...
am: 65b535f44a
2019-04-05 20:43:37 -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
Fan Zhang
0e89993b47
Merge "Clean up tts preference layout." into qt-dev
...
am: 963ebf576a
2019-04-05 19:34:15 -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
Christine Franks
65b535f44a
Merge "Use CDS display white balance getter and setter" into qt-dev
2019-04-06 01:25:41 +00: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
Antony Sargent
ed5c2a1b10
Don't allow CBRS subscriptions to be set as default for Calls/SMS
...
CBRS subscriptions (also known as "opportunistic" in the code base) are
data-only and it should not be possible to try to set them as the
default for Calls or SMS.
Fixes: 125855327
Test: make RunSettingsRoboTests
Change-Id: Ie20ef21ccc7b27315089f6a61cceb6e1512ec373
2019-04-05 16:48:53 -07:00
TreeHugger Robot
963ebf576a
Merge "Clean up tts preference layout." into qt-dev
2019-04-05 23:36:07 +00: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
Christine Franks
84e67e1f72
Use CDS display white balance getter and setter
...
Bug: 123930917
Test: make ROBOTEST_FILTER="(DisplayWhite*)" RunSettingsRoboTests -j48
Change-Id: Iafc6ff9a61b69baf03efddd52687093c55d35178
(cherry picked from commit ebacc33852
2019-04-05 21:36:34 +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
Fan Zhang
5bb4ef7c45
Clean up tts preference layout.
...
Deleted the custom tts layout and use preference_radio directly.
Fixes: 129994473
Test: visual
Change-Id: Ifc50e0cf9f805776e0529ffd5d672283f28a1d15
2019-04-05 13:44:37 -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
