Commit Graph

35600 Commits

Author SHA1 Message Date
TreeHugger Robot
96324ec3a3 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev am: 2aa8d2b437
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec5873050d56edd21763a467766a80e844ba7dfe
2021-03-05 10:15:32 +00:00
TreeHugger Robot
2aa8d2b437 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev 2021-03-05 09:53:05 +00:00
Jason Hsu
c022defb32 Merge changes I135e5218,I1efd9760,Ia3d03054,I1fbe3157,Ic206a940, ...
* changes:
  Add seekBar properties 'tickMark' to LabeledSeekBarPreference
  Add the preference controller to control accessibility button fade preference
  Add the preference controller to control accessibility button preview preference
  Add the preference controller to control accessibility button opacity preference
  Add the preference controller to control accessibility button size preference
  Add the preference controller to control accessibility button location preference
  Setup basic layout and resources for the accessibility button settings page
2021-03-05 06:40:06 +00:00
Tom Hsu
3bc9bcdae2 Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I724225de0d877cf017b289b7a0b9198771b20ba9
2021-03-05 04:53:46 +00:00
Abel Tesfaye
50e41300a9 Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev am: 61aa289dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13714687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70ce193ba057b981dc39ec1b5165fa1afa5ef416
2021-03-05 04:53:02 +00:00
TreeHugger Robot
ef509128d5 Merge changes from topic "jr_device" into sc-dev am: dd6255a653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c3f66711f680ad87fdef74835df607410d2460
2021-03-05 04:50:43 +00:00
TreeHugger Robot
7e7779a422 Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev am: 74d540f8f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13755450

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85baaf7368b8f34046e606a451528fd3d3c416df
2021-03-05 04:25:01 +00:00
Tom Hsu
1db2d1a25b Merge "[Provider Model] Fix preference summary not update." into sc-dev 2021-03-05 03:25:59 +00:00
Abel Tesfaye
61aa289dac Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev 2021-03-05 02:39:02 +00:00
jasonwshsu
9584ba6b57 Add seekBar properties 'tickMark' to LabeledSeekBarPreference
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
2021-03-05 10:27:39 +08:00
jasonwshsu
f9fdedaafe Add the preference controller to control accessibility button fade preference
* Opacity preference will be disabled when fade is disabled

Bug: 173940869
Test: atest AccessibilityButtonFadePreferenceControllerTest AccessibilityButtonOactiyPreferenceControllerTest
Change-Id: I1efd9760aa0287899cddd10ddd9a88a81ccc39ba
2021-03-05 10:27:39 +08:00
jasonwshsu
603014760f Add the preference controller to control accessibility button preview preference
* Create FloatingMenuLayerDrawable class to handle the preview layer drawable

Bug: 173940869
Test: atest AccessibilityButtonPreviewPreferenceControllerTest FloatingMenuLayerDrawableTest
Change-Id: Ia3d030547b377e87c505b2310f559f7f3876ecd5
2021-03-05 10:27:34 +08:00
TreeHugger Robot
dd6255a653 Merge changes from topic "jr_device" into sc-dev
* changes:
  Update NLS listing page
  Add device list to NLS pages
  Add icons to NLS mgmt page
2021-03-05 01:02:02 +00:00
TreeHugger Robot
74d540f8f0 Merge "[Provider Model] Ethernet default network with APM enabled on Panel" into sc-dev 2021-03-04 22:46:37 +00:00
Julia Reynolds
ddf1958bdc Update NLS listing page
- Organized by allowed/not allowed
- Include paired devices if there are any

Test: settings robotests
Fixes: 181125174
Change-Id: Id64ee0ebd9b40a92d54a03d92fec3ff0bb3b926d
2021-03-04 20:54:10 +00:00
Abel Tesfaye
9481334a6a Instrument metrics for smart-auto-rotate and screen timeout
Test: locally with flame

Bug: 172974834
Change-Id: Id6927e749049c88e4efea2d69f93b9d397acc1c1
2021-03-04 20:01:36 +00:00
Yi Jiang
05a310b89b Merge "Adds 'more details' hyper link." into sc-dev am: c08943784c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769106

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3da3a8ced8594349dd7e01063b0d2f3cae253883
2021-03-04 18:58:16 +00:00
Yi Jiang
c08943784c Merge "Adds 'more details' hyper link." into sc-dev 2021-03-04 18:11:11 +00:00
Julia Reynolds
ef6646458b Add device list to NLS pages
If a notification listener has access via the
companion device manager api, list the name(s) of the
associated devices to give the user more context about
why the app has notification listener access.

Test: settings unit
Bug: 181125174
Change-Id: I01771b2c4e136fe16d23e89f33f85f63803e3f7c
2021-03-04 15:31:35 +00:00
Stanley Wang
664824e532 Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev am: a380b04d7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75a8d4f63453d2b369d7274eb360ce5be35a3ab4
2021-03-04 14:43:33 +00:00
Stanley Wang
a380b04d7b Merge "Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM" notification will pop up." into sc-dev 2021-03-04 14:12:47 +00:00
tom hsu
edaeb41ff7 [Provider Model] Fix preference summary not update.
- When activity enter onPause, the status will not update, then
 sub id of TelephonyManager keep same value after activity go back.

 - Solution: Everytime update the UI, and always get new
 TelephonyManager with the latest sub id.

Bug: 181196545
Test: atest passed.
Test: Manual test passed.
Change-Id: I1d65bbc06af66b97b6c85f40bed394da03213d06
2021-03-04 21:26:57 +08:00
Stanley Wang
29693a2fee Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev am: c4d839e3df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13746187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c6191294fa54fbebe51dc50e206b1b787e02028
2021-03-04 13:10:17 +00:00
Calvin Pan
f8fdb4dd27 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev am: 41a7293038
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13656807

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3bd1779077a6b41dd08c18be77f5027e4ea4f6e
2021-03-04 13:09:26 +00:00
Stanley Wang
c4d839e3df Merge "Fix the overlap issue of MainSwitch and list view." into sc-dev 2021-03-04 11:44:38 +00:00
Calvin Pan
41a7293038 Merge "Show VoLTE UI when VoIMS opt-in enabled" into sc-dev 2021-03-04 11:33:47 +00:00
Weng Su
698b4b3ca0 [Provider Model] Ethernet default network with APM enabled on Panel
- Move the connected Wi-Fi network into Wi-Fi list

- Screenshot:
  https://screenshot.googleplex.com/ALgpHTy8RWUYjSk

Bug: 178926547
Bug: 179106406
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Idd0e0ab52d6fc88633d5b2eddabb00036e077c88
2021-03-04 18:27:54 +08:00
Yi Jiang
bc6ec17120 Adds 'more details' hyper link.
Adds a 'more details' hyper link in the footer when options are disabled
by admin.

Test: make ROBOTEST_FILTER=ScreenTimeoutSettingsTest RunSettingsRoboTests
Bug: 180314728
Change-Id: I880ccd73f4b2ef0b695619ef42ec87559dc2b65b
2021-03-04 01:19:50 -08:00
Stanley Wang
b69896ae60 Fix that when scrolling to the top on Wi-Fi page, the "Turn off SIM"
notification will pop up.

The root cause of the problem is that the switch preference and
switch bar status are not sync when using setCheckedInternal API.

Fix: 179498532
Test: Run robotest and see the ui
Change-Id: Ib51dc2ef27ce49b9c8ba69eb32757bf6b9945baf
2021-03-04 15:50:47 +08:00
Hugh Chen
50fc7d15ef Fix "USB tethering" doesn't work after reconnecting USB
Before this CL, if users selects usb tethering option and
reconnects usb it would not start entitlement check.
Because we only start entitlement checks when users select it.

This CL will start entitlement checks when usb tethering option
is selected and reconnects usb.

Bug: 176037347
Test: make -j42 RunSettingsRoboTests
Change-Id: I3a2ad392a1cae9cf97355ef3cd4fb8c23de18673
2021-03-04 15:31:11 +08:00
Stanley Wang
3b70c6c41a Fix the overlap issue of MainSwitch and list view.
This issue happen on Developer and Wi-Fi pages, so the problem
should be solved on SettingsActivity.

Fix: 181341927
Test: Run robotest and see the ui
Change-Id: I57722cfcbeb6390c88101d808429346045e57c92
2021-03-04 15:08:18 +08:00
Janis Danisevskis
e4ffcd1567 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev am: 1a10ffe990
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715126

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50331c3dd7b63b2cc259173e912da22dc50663b5
2021-03-03 23:30:17 +00:00
Janis Danisevskis
1a10ffe990 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev 2021-03-03 22:28:41 +00:00
Yu-Han Yang
ec189cc0da Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev am: d0267d5f8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13732560

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia69d0da674cd6e5ba2331cf6a593366747e5d4e4
2021-03-03 21:41:50 +00:00
Yu-Han Yang
d0267d5f8d Merge "Add showSystem to RecentLocationAccess (Settings)" into sc-dev 2021-03-03 20:45:29 +00:00
jasonwshsu
c497c7aabe Add the preference controller to control accessibility button opacity preference
Bug: 173940869
Test: atest FloatingMenuOpacityPreferenceControllerTest
Change-Id: I1fbe3157c93fef4611c3b9b13569c9b339e2898a
2021-03-04 01:19:30 +08:00
jasonwshsu
04955b96ae Add the preference controller to control accessibility button size preference
Bug: 173940869
Test: atest FloatingMenuSizePreferenceControllerTest
Change-Id: Ic206a940abde90641442df37a634c8cb3a345597
2021-03-04 01:19:30 +08:00
jasonwshsu
123464429d Add the preference controller to control accessibility button location preference
Bug: 173940869
Test: atest AccessibilityButtonLocationPreferenceControllerTest
Change-Id: I49a23b2eb4e07e79afcefc5a148c23b06396ec1c
2021-03-04 01:19:19 +08:00
Adrian Roos
f11a6ddaf2 Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e" am: d99faa25c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754174

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaae85597ea364bab628f8fce9230d7887c4f6466
2021-03-03 15:39:29 +00:00
Adrian Roos
d99faa25c0 Revert "Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e"
This reverts commit 0df55e1eb4.

Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.

Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
2021-03-03 14:51:42 +00:00
Paul Hu
d41839e69e Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e am: 0df55e1eb4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49005966712f2d6aee155375546ae5554aa6bce1
2021-03-03 13:38:25 +00:00
Paul Hu
0df55e1eb4 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4332292590088a0453cd7cfa2dc66f775e2d79dd
2021-03-03 13:27:16 +00:00
TreeHugger Robot
551319a151 Merge "Return RESULT_OK RequestManageCredentials" into sc-dev am: 42ac293a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13754167

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe97019bc21e9c44a97b57d61da05091d4de790d
2021-03-03 13:03:35 +00:00
TreeHugger Robot
10c997f5bb Merge "Refactor Usb settings" into sc-dev am: decaeda453
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13736527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb5da138a1dbdd6fde3daf48c2a4de0988505297
2021-03-03 13:03:27 +00:00
TreeHugger Robot
42ac293a53 Merge "Return RESULT_OK RequestManageCredentials" into sc-dev 2021-03-03 12:43:13 +00:00
TreeHugger Robot
decaeda453 Merge "Refactor Usb settings" into sc-dev 2021-03-03 12:12:24 +00:00
Alex Johnston
c82767f627 Return RESULT_OK RequestManageCredentials
Bug: 177979648
Test: Manual testing
Change-Id: I3b4968131f8c7b811752704808d0ef4df617a658
2021-03-03 11:30:46 +00:00
Hugh Chen
0091ae6142 Refactor Usb settings
1. Rename ShouldIgnoreClickEvent() to isClickEventIgnored().
2. Use TetheringManager instead of ConnectivityManager.

Bug: 175651578
Test: make -j42 RunSettingsRoboTests
Change-Id: I37c49694257b7575550b5a905e293b5d056ba1bf
2021-03-03 18:13:17 +08:00
Paul Hu
8c38e9543e Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f am: ddf3efb070
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccd3b694b9e9f4ac1658093923c923a98d83ccfb
2021-03-03 08:07:19 +00:00
Sally Yuen
bd7a6cc05e Merge "[Reduce Bright Colors] Add labels to intensity slider" into sc-dev am: aaff760df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13501303

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I081571447b34652fffc03f5eba756c6d88db2a8f
2021-03-03 03:23:10 +00:00