Commit Graph

8842 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
f3cd7b6b17 Merge "Update datausage for DataUsagePreferenceController" into qt-dev
am: 2ace95f386

Change-Id: I09ff46fcb21181976bc96381e9cbc74bf13b6030
2019-05-08 12:56:23 -07:00
Salvador Martinez
fb940feebf Clear preferences when dialog acknowledged and increase order
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.

Test: atest BatterySaverScheduleSeekBarControllerTest
Bug: 132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
2019-05-08 12:28:43 -07:00
TreeHugger Robot
2ace95f386 Merge "Update datausage for DataUsagePreferenceController" into qt-dev 2019-05-08 19:20:13 +00:00
Antony Sargent
a3c46e0543 Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev
am: ea6bd51bea

Change-Id: I32b1142594b2aff558cc3e39e022ea1dfea503dc
2019-05-08 11:59:05 -07:00
Fan Zhang
3e14383a28 Display settings homepage content fully edge-to-edge
This is needed to support fully gesture navigation.

Bug: 132182711
Test: visual
Change-Id: Ifaf15ecec73b974356355a74e73754f95b84ad3e
2019-05-08 11:43:58 -07:00
TreeHugger Robot
ea6bd51bea Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev 2019-05-08 18:31:39 +00:00
Lei Yu
b47b99ed38 Add null check when restart batteryinfo loader
Even though we unregister contentObserver in onPause and register
in onResume, callback still be called while fragment is detached.

Anyhow add a null check in settings to stop crash

Fixes: 131905853
Test: RunSettingsRoboTests
Change-Id: I8c0c2c04c3b8d942e0c97cf71a7d3e735a24b467
2019-05-08 11:12:55 -07:00
Alex Salo
83a63abd2d Re-enable the test
Update the test to handle new API and simplify the logic in the
controller.

Bug: 130897305
Test: make RunSettingsRoboTests -j64

Change-Id: I0c46ff22d4a3bf913add753f85a24af9aeee0a33
2019-05-08 17:48:12 +00:00
Fan Zhang
25e5a98734 Merge "Add flag to disable part of event_logging in Settings." into qt-dev
am: c949d12a12

Change-Id: Iedae12a638188a5c41f67ce880171e1606a2e582
2019-05-08 10:40:03 -07:00
Edgar Wang
ed2e1e9a0f Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev
am: e3278d8240

Change-Id: Ifa70334797f19a2c87b7c361345158e76c136509
2019-05-08 10:32:06 -07:00
Lei Yu
9bc3273489 Update datausage for DataUsagePreferenceController
Data usage number was wrong because we didn't set correct
subId, this CL fixes this issue.

Bug: 132113657
Test: RunSettingsRoboTests
Change-Id: If7c9cf2f4709d9a8e5f9a154c02de9484800d6d5
2019-05-08 10:25:10 -07:00
TreeHugger Robot
c949d12a12 Merge "Add flag to disable part of event_logging in Settings." into qt-dev 2019-05-08 17:15:03 +00:00
Yi-Ling Chuang
9a8717c9c0 Merge "Add null check before setting the visibility of swipe background" into qt-dev
am: 1079d2833a

Change-Id: Ifcba7bc83c390e3cb1a863b11b7d9637c0ba48a2
2019-05-08 10:12:51 -07:00
TreeHugger Robot
e3278d8240 Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev 2019-05-08 17:03:42 +00:00
TreeHugger Robot
1079d2833a Merge "Add null check before setting the visibility of swipe background" into qt-dev 2019-05-08 16:34:32 +00:00
Aran Ink
6bf5b847f6 Merge "Create Settings preference for Global Actions Panel." into qt-dev
am: 70313a4600

Change-Id: Ied8fd12055503411fcb8e33cb40e241668a8d567
2019-05-08 07:35:13 -07:00
Aran Ink
70313a4600 Merge "Create Settings preference for Global Actions Panel." into qt-dev 2019-05-08 14:16:07 +00:00