Commit Graph

229 Commits

Author SHA1 Message Date
Hugh Chen
112a638cba Fix it will auto switch back to "No data transfer" after selecting "USB Tethering"
Before this CL, the USB option didn't handle whether FUNCTION_NCM
existed in the intent extra when tethering was started which resulted
in some devices that enable NCM will have incorrect UI.

This CL added a condition to check whether FUNCTION_NCM existed in the
intent extra or not to fix this UI issue.

Bug: 192046902
Test: make -j42 RunSettingsRoboTests
Change-Id: Icb8548409930d59dc3a08c25e418c9a1ddb9f33c
2021-07-09 10:52:50 +08:00
George Chang
96b5af7e39 Separate NFC on/off strings
For pt-BR, it needs a different gender when we are referring to "NFC".

Bug: 189314407
Test: check On/Off strings
Change-Id: I87da43c66a65b3ef2fcd9c57632b36302d9920e8
2021-07-02 11:20:03 +08:00
Alex Johnston
0ad4783163 Fix Settings usb preference search
* Invert isPageSearchEnabled check

Bug: 192449168
Test: manual testing with TestDPC
Change-Id: I91dcf930485ad16a83cb04bf170c9608c1768ea2
2021-06-30 14:36:23 +00:00
Zim
6699b47f77 Update string to enable transcode via MTP
Also added a summary string when checked.

Test: Manual
Bug: 191985287
Change-Id: I1db9763bbf3766eecace6eca168218ab71ca6195
2021-06-24 20:13:08 +01:00
Sunny Shao
9fa4bb8ffa Fix the toggle button flicker problem when display
- Root cause: the side effect of the parallel controller loading.
- Solution: disable the parallel approach and remove the entry point
  of parallel approach in DashboardFragment.

Fixes: 187838753
Test: Robo test for AppInfoDashboardFragment, ConfigureNotificationSettings,
      ConnectedDeviceDashboardFragment, DevelopmentSettingsDashboardFragment,
      NetworkDashboardFragment, DashboardFragment
Change-Id: If3b09c4fd6f33042e0ed38704f08e855ab8f5377
2021-06-16 11:41:10 +08:00
Yanting Yang
3e2313e958 Update homepage summaries
- Network & internet
- Connected devices
- Display
- Wallpaper & style
- Accessibility
- Tips & support
- Also clear the redundant codes and tests.

Fixes: 183642373
Fixes: 189981034
Fixes: 190011428
Fixes: 190015037
Test: robotests & visual
Change-Id: Ide19fa5aff67e093d86b259c5e7a307b9ad37550
2021-06-06 12:28:03 +08:00
TreeHugger Robot
11fa4d3275 Merge "Fix truncated in USB preference" into sc-dev 2021-06-01 05:44:48 +00:00
TreeHugger Robot
f10ecb43d1 Merge "Fix flickering in USB page" into sc-dev 2021-06-01 05:44:35 +00:00
Hugh Chen
dd42f65e4e Fix flickering in USB page
Init usb UI in displayPreference().

Bug: 189390680
Test: make RunSettingsRoboTests
Change-Id: I0c9c7954a49a8484b466c852c2336ead032cc2e4
2021-05-27 14:25:01 +08:00
Hugh Chen
aedba90a9e Fix truncated in USB preference
Make preference could be shown two line title.

Screenshot:
https://screenshot.googleplex.com/Akod4qejhzmDH8z.png

Bug: 189189209
Test: manually test
Change-Id: Id2c69ba07d81234dce0b31ffd2cc80fb0d1e6f7f
2021-05-27 10:15:10 +08:00
Hugh Chen
51b6605aef Fix connected devices settings jank issue
Completed the UI in displayPreference() to fix jank issue.

Bug: 188752628
Test: make RunSettingsRoboTests
Change-Id: Ib97b76e1b8622424ad481597f63d3540fb0bfc5b
2021-05-26 17:37:13 +08:00
Yanting Yang
c37abc9edb Merge "Add summary back to the homepage" into sc-dev 2021-05-07 09:00:32 +00:00
TreeHugger Robot
e6b78a5ada Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev 2021-05-06 07:58:25 +00:00
Yanting Yang
d1312e8e6e Add summary back to the homepage
Also update some summaries with new strings.

Bug: 183586663
Test: robotests & atest & visual

Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-06 00:27:37 +08:00
Hugh Chen
db53d1c6f8 Fix borken test on Bluetooth and connected package
Bug: 187239965
Test: make RunSettingsRoboTests -j56
Change-Id: Ic0d60a6cd46b1211efb2021f079c0b0a6534b383
2021-05-05 14:31:01 +08:00
Hugh Chen
139ff59346 Fix the section below "Pair new device" moves up a few pixels
This CL add new controller that used to show the summary when
bluetooth is off. It can prevent a jank since the UI is decided
before render.

Bug: 182232469
Test: make RunSettingsRoboTests -j56
Change-Id: I78eb757cd1b636fbb18028fb2294861467bc6eba
2021-05-04 20:45:41 +08:00
Hugh Chen
ddafb202bd Fix usb tethering switch back to none after off/on the screen
This CL adds conditions to check whether usb is connected or not.
If usb is not connected or tethering is not started don't update the
state.

Bug: 157709648
Test: make RunSettingsRoboTests -j56
Change-Id: Ifbf5900923419d6abf35834b196aab12601076e4
2021-04-28 09:12:15 +00:00
TreeHugger Robot
6535fe00c7 Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev 2021-03-09 03:07:42 +00:00
Hugh Chen
bbbae9af8a Fix battery level of earbuds bt devices is inconsistent
Before this CL, bluetooth settings update the battery level of earbuds
when receiving first pair status callback. But sometimes the callback
will not send immediately cause the battery level is inconsistent.

This CL will update the earbuds battery level when onResum() to refresh
battery level immediately.

Bug: 174929347
Bug: 159544311
Test: make -j42 RunSettingsRoboTests
Change-Id: I8505f8fed4ec821b9fa2d88bc437bddd7a30f0e2
2021-03-08 16:38:31 +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
TreeHugger Robot
decaeda453 Merge "Refactor Usb settings" into sc-dev 2021-03-03 12:12:24 +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
Alex Johnston
7d4db750e6 Disallow modifying USB in Settings
Background
* The admin can disable signaling over USB
  on corporate owned device.

Changes
* If the admin has disabled signaling over
  USB, disable preferences in Settings to
  modify USB.
* Show policy transparency dialogs.

Manual Testing:
* Install TestDPC
* Set up as Device Owner
* Disable USB data signaling
* Verify Settings > Connected Devices
  > USB is disabled
* Verify Settings > Network & Internet
  > Hotspot & tethering > USB tethering
  is disabled
* Verify Developer options >
  USB debugging, default USB configurations
  and USB audio routing are disabled

Bug: 168301639
Test: Manual Testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests -j
      ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest
      make RunSettingsRoboTests -j
      ROBOTEST_FILTER=UsbDefaultFragmentTest
      make RunSettingsRoboTests -j
      ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest
      make RunSettingsRoboTests -j
      ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest
      make RunSettingsLibRoboTests -j
      ROBOTEST_FILTER=EnableAdbPreferenceControllerTest

Change-Id: I3e8461ac37f406a407c874598335cde28fb89b2d
Merged-In: I3e8461ac37f406a407c874598335cde28fb89b2d
2021-02-16 15:29:49 +00:00
Manish Singh
f8b9101314 Disable MTP transcoding by default
BUG: 178769134
Test: manual
Change-Id: Ib87d0f499bd699276326a41b37f42c7a85893afe
2021-02-04 17:41:20 +00:00
Manish Singh
29a6c26d80 Add Settings UI for MTP transcoding over USB.
Enabling "Transcode exported media" means that the media transferred
from the device via MTP over USB would be transcoded, if necessary. This
switch also sets / unsets the sys.fuse.transcode_mtp system property.

"Transcode exported media" category would be accessible only when the
"File transfer / Audio Auto" or "PTP" radio button has been selected. We
are including PTP also since PTP supports transfer of videos.

Adding UsbDetailsTranscodeMtpController in a separate preference
category than "Charge connected device" primarily because they seemed to
be different in their own rights.

Here are a few screenshots:
https://screenshot.googleplex.com/8jeMstnSFsTtVCS.png
https://screenshot.googleplex.com/76hNz4iXp5dcX4M.png
https://screenshot.googleplex.com/AkTngE5hDDJCovv.png
https://screenshot.googleplex.com/4uQYGXuuSQLoz3w.png

BUG: 158466651
Test: manual testing.  Also added unit test.
Change-Id: I2603a9bffed3320c193cc08f867bd67d9848da18
(cherry picked from commit 974662936e)
2021-01-29 20:22:05 +00:00
Stanley Wang
b87ddba6cd Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings.
To log Settings metrics, the MainSwitch extends MainSwitchBar and
replace the SwitchBar in SettingsActivity.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui

Change-Id: I3add3702e9058ad9192b5172c7cf0e2ccfb55a70
2021-01-14 22:48:31 +08:00
Hugh Chen
8f29850cca Fix crash on connected devices settings
If disconnected bluetooth devices didn't exist in
recent devices, the index will return -1. Our condition
didn't check this situation, the IndexOutOfBoundsException
will throw when this case happens.

This CL adds the condition to check whether index is over
than or equal 0 to fix IndexOutOfBoundsException.

Bug: 173059077
Test: make -j42 RunSettingsRoboTests
Change-Id: Id93f4cb6bded83540045c5e8c21c6f6122a39fed
2020-11-24 17:54:48 +08:00
Hugh Chen
7d71081d45 Add condition to check case of accessory combinations
Before this CL, we only compare whether the value of function is
equal to accessory to ensure usb is in accessory mode. But in some
cases there are different accessory combinations, like
"accessory,audio source". It will make the condition return false
when encountering accessory combinations.

This CL will check whether the function will include accessory mode
to fix this issue.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I7c80f02de5340799e292949608e19b86b187b982
2020-11-04 17:25:29 +08:00
Yanting Yang
9aa4a5463f Remove subtitles for the homepage IA
Remove the summary of the homepage IA if silky home enabled.

Fixes: 170933968
Test: robotest & visual with turning on/off silky home
Change-Id: I502b6590cece9b80e9923109fe0582cc4d9a1c56
2020-10-20 23:54:03 +08:00
TreeHugger Robot
868a15350a Merge "Add string for text of bluetooth switch" 2020-10-19 09:19:42 +00:00
Hugh Chen
3c33b6ea41 Add string for text of bluetooth switch
Bug: 153888620
Test: manually test
Change-Id: I60a791190abf535162f7ed1b80fe265482515137
2020-10-12 16:42:01 +08:00
TreeHugger Robot
5709f7a083 Merge "Do nothing when choosing file transfer when in accessory mode" 2020-09-30 06:54:29 +00:00
Hugh Chen
3251a04ba3 Do nothing when choosing file transfer when in accessory mode
- Before this CL, the device will be disconnected and reconnected
  to accessory mode when choosing "File transfer/Android Auto" in
  accessory mode. Because the USB menu didn't check state of
  function, it should do nothing when choosing
  "File transfer/Android Auto" in accessory mode.

  This CL add condition to check state of function, it will do
  nothing when choosing "File transfer/Android Auto" in
  accessory mode.

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I1749c6c43d2a192e4ce1bf1ae5343ff8deafbe48
2020-09-30 11:19:31 +08:00
Hugh Chen
bde627b263 Hide tethering option when in a guest account
- Before this CL, users can share their mobile data through enabling
  tethering in the USB menu when in a guest account.
  It will cause main users to spend their money unexpectedly.

  This CL will hide the tethering option on the USB menu when in the
  guest account.
- Add test cases.

Bug: 166125765
Test: 1. make -j42 RunSettingsRoboTests. 2. Switch to a guest account
to verify whether the tethering option is hiding.

Change-Id: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
2020-09-28 11:20:31 +08:00
Hugh Chen
af0a45bb7a Fix usb menu not switch to "File Transfer/Android Auto" right after connected to car unit
- This CL before usb receiver didn't check the extra
  information of the accessory. It will cause the usb
  menu not to be aware that the usb port is switched
  to accessory mode.

  This CL usb receiver will check intent whether to have
  accessory extra. If the usb port is switched to accessory
  mode the usb menu will switch to "File Transfer/Android Auto".
- Update test case

Bug: 162451162
Test: make -j42 RunSettingsRoboTests
Change-Id: I0eca89a23670c674b74753fc526256cc1d52e759
2020-09-18 15:45:37 +08:00
Hugh Chen
a6aae425bc Fix settings crash
- This CL before, "Previously connected device" didn't
  handle dock device. If user have disconnected dock
  device will cause Settings crash.

  This CL add condition to handle dock device to avoid crash.
- Update test case.

Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
2020-09-02 17:14:30 +08:00
Hugh Chen
386df49bbc Show just disconnected device on previously connected
- This CL before, previously connected devices will show most
  recently connected devices and the maximum is 3.
  In this time, if next most recently connected device is disconnected.
  It's will not show on "previously connected devices", user needs go to
  "see all" page to found that device.
  This CL add rule to compare the priority of most recently connected
  device. If priority of next disconnected device is higher than
  currnect devices that on "previously connected devices".
  Let next disconnected device show on "previously connected devices".
- Update test case.

Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I684501a20a67755b2196ba9d4b5565add01a5d01
2020-08-26 18:56:30 +08:00
Hugh Chen
bde100849e Display "see all" option when bluetooth is off
- This CL before, Bluetooth settings will hide the "see all"
  option when bluetooth is off. For the UX improvement, this
  CL will show the "see all" button when bluetooth is off. And
  turn on the BT when user press "see all" button to let user to
  quick pair their disconnected devices.
- Update and add test case

Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
2020-08-12 17:07:33 +08:00
TreeHugger Robot
270646dbe1 Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac915 am: d3d9b3d462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11708185

Change-Id: I7abcc9e2109bf66e00b14bd8d72457622e392643
2020-06-04 04:48:36 +00:00
Hugh Chen
737ec77c4f Revert "Stop usb tethering when user cancel it"
This reverts commit 9546b7fdcb.

Reason for revert: This CL will have side effort, when switch from "USB tethering" to "MTP/PTP/Midi" mode, DUT will jump to "No data transfer".
Revert this CL and have good solution to address b/154933817

Bug: 156318036
Test: build pass
Change-Id: Ia79b7a9f5d71c15244b147f5ef26af47c1c1fc7c
2020-06-03 03:35:48 +00:00
Kevin Maurin
b890ed1585 Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f
Change-Id: Ie6e40209428eb4efb0c631e01484629b87a278bb
2020-05-07 08:04:58 +00:00
Kevin Maurin
cabe76debc Display "Android Auto" in Connected Devices summary text.
Android Auto will be exposing a Settings tile under Connected Devices -> Connection Preferences.
If the Setting tile is available, then the summary text will reflect that.

Tested with additional unit tests and manually validated the scenarios by
flashing crosshatch-eng and disabling/enabling the relevant features.

Fix: 153896447
Test: Added unit coverage for new scenarios
Test: make RunSettingsRoboTests
Test: manually verified by flashing crosshatch-eng and disabling/enabling relevant components
Change-Id: I5a129c41b98ba435bc159a72c9a7c2dfd646ecd3
2020-05-06 21:42:43 -07:00
TreeHugger Robot
da7f016264 Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672 am: 1659954b04
Change-Id: I05fe58a66b635287a5201d467ac39126b43208f9
2020-05-06 11:20:08 +00:00
Yi-Ling Chuang
42956c3259 Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa am: 17deddb4d4
Change-Id: I1a0b4b16fd2ec92b210973b6338434226cbf39e2
2020-05-06 11:19:56 +00:00
TreeHugger Robot
53c6c9a672 Merge "Stop usb tethering when user cancel it" into rvc-dev 2020-05-06 10:52:09 +00:00
Yi-Ling Chuang
8258eb0327 Revert "Display "Android Auto" in Connected Devices summary text."
This reverts commit 6fb790b092.

Reason for revert: This CL causes test failures. Per Settings convention, revert the CL first.

Bug: 155829041
Change-Id: I486e09b63c9999b56d4359a7ec211fe8a6c89181
2020-05-06 10:37:47 +00:00
hughchen
9546b7fdcb Stop usb tethering when user cancel it
- Call stop tethering to clear entitlement result when user do not want
  using USB tethering on USB menu.
- Add test case

Bug: 154933817
Test: make -j42 RunSettingsRoboTests
Change-Id: Idaaba8df2052f45e710c7959251817e8947a544f
2020-05-06 16:02:35 +08:00
Kevin Maurin
4d66ddb35d Display "Android Auto" in Connected Devices summary text. am: 6fb790b092
Change-Id: Ia66712b9070df48f9406ad19fc57861d84a5841c
2020-05-05 22:50:18 +00:00
Kevin Maurin
6fb790b092 Display "Android Auto" in Connected Devices summary text.
Android Auto will be exposing a Settings tile under Connected Devices -> Connection Preferences.
If the Setting tile is available, then the summary text will reflect that.

Tested with additional unit tests and manually validated the scenarios by
flashing crosshatch-eng and disabling/enabling the relevant features.

Fix: 153896447
Test: Added unit coverage for new scenarios
Test: make RunSettingsRoboTests
Test: manually verified by flashing crosshatch-eng and disabling/enabling relevant components
Change-Id: I05e0bca1b4c05939114703f868b1c71b76410532
2020-05-05 14:05:05 -07:00
TreeHugger Robot
2fb7f3e5bb Merge "Enable some settings pages to use paralleled-loading method" into rvc-dev am: 18490b2dc8
Change-Id: I7bd50f81b088c8dc1ffcf92e23dc8be06e1d0f8e
2020-05-05 09:34:13 +00:00