Commit Graph

8762 Commits

Author SHA1 Message Date
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
Lei Yu
b9974fddc4 Merge "Add null check when restart batteryinfo loader" into qt-dev am: 285fc7f7c3
am: ddf3268ad1

Change-Id: I01c46e99d6c320350a2cbffa6d9017cacfe0bd02
2019-05-08 14:24:40 -07:00
TreeHugger Robot
cbd925bf73 Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev 2019-05-08 21:12:52 +00:00
Alex Salo
ee9f413a0f Merge "Re-enable the test" into qt-dev
am: 95c26b67f1

Change-Id: If57f2b5b8170d3f6ae303d8572244c97c6c94727
2019-05-08 14:07:58 -07:00
Fan Zhang
7f58e8cd1b Merge "Display settings homepage content fully edge-to-edge" into qt-dev
am: c084301c02

Change-Id: Iaf752753accb6324bcdc595fcd58042ca83ef7fd
2019-05-08 14:07:00 -07:00
Lei Yu
ddf3268ad1 Merge "Add null check when restart batteryinfo loader" into qt-dev
am: 285fc7f7c3

Change-Id: I75c8925d1b4b0707eb58de2e46f94c539e091e56
2019-05-08 13:50:37 -07:00
TreeHugger Robot
95c26b67f1 Merge "Re-enable the test" into qt-dev 2019-05-08 20:29:38 +00:00
Fan Zhang
c084301c02 Merge "Display settings homepage content fully edge-to-edge" into qt-dev 2019-05-08 20:26:31 +00:00
Lei Yu
285fc7f7c3 Merge "Add null check when restart batteryinfo loader" into qt-dev 2019-05-08 20:18:11 +00:00
Lei Yu
e0bde475a1 Merge "Update datausage for DataUsagePreferenceController" into qt-dev am: 2ace95f386
am: f3cd7b6b17

Change-Id: I8749dc6fb2ef0081ff1bbd5eef2dfbb01f0c97d2
2019-05-08 13:14:29 -07:00
Lei Yu
f3cd7b6b17 Merge "Update datausage for DataUsagePreferenceController" into qt-dev
am: 2ace95f386

Change-Id: I09ff46fcb21181976bc96381e9cbc74bf13b6030
2019-05-08 12:56:23 -07:00