TreeHugger Robot
6a3eb31763
Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev
2019-05-13 18:58:44 +00:00
Mady Mellor
34fa757cc9
Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev
...
am: 240b227e1f
Change-Id: I899722a6df929c4093a5a74447eb25a610c80308
2019-05-13 11:38:26 -07:00
Mady Mellor
240b227e1f
Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev
2019-05-13 18:18:31 +00:00
andychou
9ac6d81177
Fix IMEI information can't display without pSIM inserted
...
When no SIM, we can't get active subscription info.
So current code will not create TelephonyManager and cause IMEI not
retrieved.
Create TelephonyManager with default if no subscription info.
Bug: 132215720
Test: test with SIM and without SIM to check SIM status UI and atest ImeiInfoDialogControllerTest pass
Change-Id: Iaeb932ea66a6bee77136251941cca657984e456f
2019-05-14 00:55:47 +08:00
TreeHugger Robot
9a0a868e05
Merge "Fix robolectric test error"
2019-05-13 10:21:20 +00:00
Raff Tsai
3c337d5659
Fix robolectric test error
...
Fixes: 132575837
Test: make RunSettingsRoboTests
Change-Id: I5238a3789f5308a489298fadae772b8b9343ddb5
2019-05-13 16:56:05 +08:00
Tim Peng
82adb00c8c
Hide audio switcher entry-point in the volume slice when in call am: c007158819
...
am: a60471e1e5
Change-Id: I29dc0c5d3f5ed9f5f37eedda06bdaf59575d074b
2019-05-12 19:22:41 -07:00
Tim Peng
a60471e1e5
Hide audio switcher entry-point in the volume slice when in call
...
am: c007158819
Change-Id: I76265d9eccf5174df500c4c1518af6d3c1fc2cad
2019-05-12 19:09:24 -07:00
Tim Peng
c007158819
Hide audio switcher entry-point in the volume slice when in call
...
- update test case
Bug: 132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibfd12e75f584b6884d1025018772ac9c19673156
2019-05-13 01:38:39 +00:00
Raff Tsai
f33c047cbd
Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev am: 42aac32823
...
am: b202df4422
Change-Id: I83a4fcefd33d9b9126a75deab92af74ae9f68d4b
2019-05-11 03:41:24 -07:00
Jason Chiu
2c3e6c6434
Fix automatically directing the user to the captive portal in Wi-Fi Slice
...
The feature failed after the CL "Force the adapter to rebind cards with
a toggle".
Because toggle slices have been forced to rebind after starting another
activity and when any slice is updating. This unpins Wi-Fi slice and
stops WifiScanWorker and then clears the saved clicked network.
Solution:
1. Change ConnectToWifiHandler from activity to receiver and send
broadcasts to it with FLAG_RECEIVER_FOREGROUND, so Wi-Fi slice won't
be forced to rebind.
2. Seperate Wi-Fi scan worker and contextual Wi-Fi scan worker. Keep the
original logic for the generic one, and then add the logic below to
the contextual one.
3. Do not clear the saved clicked network when slice is unppined because
it happens frequently in contextual homepage.
4. Introduce a static long in ContextualWifiScanWorker that updates once
in every visible UI session. A session is when the screen is visible
to user.
5. Use session token to determine whether auto-starting captive portal
is needed.
Fixes: 128056349
Test: robotest, visual in homepage and network panel
Change-Id: I9e03c379806e124fa7253b2a635574b2433f6afc
2019-05-11 03:26:57 +00:00
hughchen
1042c287ac
Merge "Clear media switcher items when in phone call" into qt-dev am: 12dcbe7c71
...
am: 26aa660541
Change-Id: Id7ade81d98528bb6c16fee243d148d359101712d
2019-05-10 20:22:01 -07:00
Raff Tsai
b202df4422
Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev
...
am: 42aac32823
Change-Id: I82dc550b23c6fc11fff350c7c72f0154985a62f6
2019-05-10 19:50:15 -07:00
TreeHugger Robot
42aac32823
Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev
2019-05-11 02:27:24 +00:00
Raff Tsai
3d2655c100
Log ACTION_CONTEXTUAL_CARD_SHOW in different place
...
Fixes: 132396134
Test: robolectric
Change-Id: I7d46df15fbc42838da0fa53f4db7e1aa026c3174
2019-05-11 08:28:08 +08:00
Mady Mellor
32fa736dd6
Move feature-level Bubble setting into developer options; default to off
...
Functionality:
* Moves feature-level setting into developer settings (apps section)
* Adds bubbles in developer options under "apps" section
* Configures the app-specific bubble toggle in notifications settings
to be hidden / shown based on the developer setting
* Configures the channel-specific bubble toggle in notification channel
settings to be hidden / shown based on the developer setting
Tests:
* Anything that might be assuming that it's globally enabled now has
a bit to enable it globally in that test
* There is a logic change now where the app-level setting would be available
even if off globally, now that is not true -- if it's off globally the
app-level is no longer available
* Adds tests for the developer setting
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 131845765
Change-Id: I5f6bf74e5ada3fc023571825cca10d7bddc60e6e
2019-05-10 15:41:06 -07:00
hughchen
26aa660541
Merge "Clear media switcher items when in phone call" into qt-dev
...
am: 12dcbe7c71
Change-Id: Ieb3326b10dd25c22c9e16286585a6dbdedf2fa35
2019-05-10 11:49:43 -07:00
Andrew Sapperstein
32e3664abf
Ignore failing test.
...
Bug: 132441284
Test: robotests
Change-Id: Ib3c7f9854e3ffba4e7e04bfb1fb1763fc77e160b
2019-05-10 11:25:23 -07:00
TreeHugger Robot
12dcbe7c71
Merge "Clear media switcher items when in phone call" into qt-dev
2019-05-10 18:14:02 +00:00
Arc Wang
a8bd70f7a9
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev am: 41656de5d4
...
am: 3ce4382031
Change-Id: Idd3be7b3e359a0e71bab0afd6ea016dae38f6f17
2019-05-10 07:13:08 -07:00
Kevin Chang
529753c9eb
Merge "Override performClick method to eliminate redundant click" into qt-dev am: 1915fe3b67
...
am: 9714ce162a
Change-Id: If9b40d1fe2e44c6f614a6fcff97b34f073f2b254
2019-05-10 07:00:47 -07:00
Pengquan Meng
f44a812872
Merge "Fixed network name for about/sim_status" into qt-dev am: b73d3c70c8
...
am: f7c9da43cf
Change-Id: Id480ee149ec51d52e3d5a705a6201e44b8e953d8
2019-05-10 06:55:47 -07:00
Arc Wang
3ce4382031
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev
...
am: 41656de5d4
Change-Id: I9c051a5ecce1e9f0b2d8b58c1df8fbc7721cb8d7
2019-05-10 05:30:41 -07:00
Kevin Chang
9714ce162a
Merge "Override performClick method to eliminate redundant click" into qt-dev
...
am: 1915fe3b67
Change-Id: I3de055284663373d83657334ae120c599682b97b
2019-05-10 02:24:16 -07:00
Pengquan Meng
f7c9da43cf
Merge "Fixed network name for about/sim_status" into qt-dev
...
am: b73d3c70c8
Change-Id: I4163adc7824982b06324335651b8a5c681d6eef6
2019-05-10 02:14:09 -07:00
TreeHugger Robot
41656de5d4
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev
2019-05-10 09:09:25 +00:00
Kevin Chang
1915fe3b67
Merge "Override performClick method to eliminate redundant click" into qt-dev
2019-05-10 06:32:25 +00:00
Arc Wang
454553ed52
Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"
...
We should make sure both 'Use location' & 'Wi-Fi scanning' are enabled
before calling setWifiWakeupEnabled.
Bug: 131777439
Test: manual
Change-Id: I602917cfa7c5581ecb414e8c44b4e20c8f9ea78d
2019-05-10 14:13:07 +08:00
Pengquan Meng
b73d3c70c8
Merge "Fixed network name for about/sim_status" into qt-dev
2019-05-10 06:10:48 +00:00
Kevin Chang
d3496412f7
Override performClick method to eliminate redundant click
...
Bug: 132226328
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SwitchBar
Change-Id: I22987a7695dfc84e50d6419604a9512f98cf4d13
2019-05-10 11:52:24 +08:00
hughchen
095c5be448
Clear media switcher items when in phone call
...
- update test case
Bug: 132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: I2bbd35e869e8ab5596d280d04fddc98f05629190
2019-05-10 10:27:26 +08:00
Raff Tsai
6f162ee6f8
Merge "Fix robolectric test error" into qt-dev am: c617fa2e87
...
am: 8eed7ab16b
Change-Id: I85f13ff20bb7089b5b0e6021e8b6712e74e35480
2019-05-09 18:15:07 -07:00
Pengquan Meng
0ab776f69d
Fixed network name for about/sim_status
...
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.
Bug: 31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
2019-05-09 15:16:20 -07:00
Raff Tsai
8eed7ab16b
Merge "Fix robolectric test error" into qt-dev
...
am: c617fa2e87
Change-Id: I34539bf27f4dd4cf56e35f9e039529f68104d060
2019-05-09 13:30:16 -07:00
Jason Chiu
46294872c7
Remove On/Off subtext next to the Wi-Fi toggle
...
Fixes: 132312797
Test: robotest, visual
Change-Id: I2c3b39e8deda211d23be0b2a73426778dbbf53db
2019-05-09 15:19:02 +08:00
Raff Tsai
1b28754b98
Fix robolectric test error
...
Bug: 132302277
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.AdaptiveSleepPreferenceControllerTest"
Change-Id: I6c823298d8e346eb2e87686a691dc4a2536423f6
2019-05-09 11:36:35 +08:00
tmfang
cb183220f2
Merge "Fix WebViewAppPickerTest" into qt-dev am: 28006039c5
...
am: a3345935bd
Change-Id: I68e0fc083ea7557a953f14f560b21caca0873261
2019-05-08 20:33:40 -07:00
Arc Wang
2723563a19
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev am: 5c461a2859
...
am: 6830a691dd
Change-Id: I3c74212e9efa6227f5c591080f3b593fb7e42b5a
2019-05-08 20:32:32 -07:00
Andrew Sapperstein
acd3a9f96d
Merge "Update summary for mobile data toggle for CBRS." into qt-dev am: cf964643b5
...
am: f8058733c2
Change-Id: Id779383a7216a53cc41c96eea76265c0a6b06105
2019-05-08 20:27:49 -07:00
tmfang
a3345935bd
Merge "Fix WebViewAppPickerTest" into qt-dev
...
am: 28006039c5
Change-Id: Ie0baea1d62d5d3c04b5af48a73c2ff5f3a9a40a8
2019-05-08 19:16:45 -07:00
Arc Wang
6830a691dd
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
...
am: 5c461a2859
Change-Id: If6b45a274e22f0bc8c60b2276a0db39778bd2b34
2019-05-08 19:11:24 -07:00
Andrew Sapperstein
f8058733c2
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
...
am: cf964643b5
Change-Id: I01bb48fc8bf405d6d807630e01e1f03a14432f9f
2019-05-08 19:01:36 -07:00
TreeHugger Robot
28006039c5
Merge "Fix WebViewAppPickerTest" into qt-dev
2019-05-09 02:00:26 +00:00
Arc Wang
5c461a2859
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
2019-05-09 01:29:48 +00:00
TreeHugger Robot
cf964643b5
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
2019-05-09 00:51:31 +00:00
Andrew Sapperstein
477e345f21
Update summary for mobile data toggle for CBRS.
...
Fixes: 127529917
Test: robotests
Change-Id: Id2d0bdbcf9674106a3dff8db8e9ceb22dbdda314
2019-05-08 15:55:04 -07:00
Salvador Martinez
83fc48a63a
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev am: cbd925bf73
...
am: 63fb185d64
Change-Id: Idd12b811d0dfd5805a626c97c8c422c3cd7b4e4a
2019-05-08 15:14:40 -07:00
Alex Salo
925c6c0e68
Merge "Re-enable the test" into qt-dev am: 95c26b67f1
...
am: ee9f413a0f
Change-Id: Iad9f54f7ec685e116bd9e835296ebb0d9eb38ef4
2019-05-08 14:48:07 -07:00
Fan Zhang
5f91d8da42
Merge "Display settings homepage content fully edge-to-edge" into qt-dev am: c084301c02
...
am: 7f58e8cd1b
Change-Id: I5425c23716ad8118a6313433545c783f55bf7db4
2019-05-08 14:47:07 -07:00
Salvador Martinez
63fb185d64
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
...
am: cbd925bf73
Change-Id: Ide094fdbacadb8ea40f2e3b0bad32a8d9644ebe5
2019-05-08 14:28:12 -07:00