Commit Graph

203 Commits

Author SHA1 Message Date
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
Sunny Shao
6d60248053 Enable some settings pages to use paralleled-loading method
- Here these pages include AppInfoDashboardFragment, ConnectedDeviceDashboardFragment,
  DevelopmentSettingsDashboardFragment, NetworkDashboardFragment, ConfigureNotificationSettings.
- The TimeSpentInAppPreferenceController use the LiveDataController.

Fixes: 135299529
Bug: 137558156
Test: compilation
Change-Id: I455a16536c9966184f1b2bd81d1f1217f3e09f9d
2020-05-04 10:34:23 +08:00
TreeHugger Robot
2fa2b57ec2 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f
Change-Id: Ifa0eadf6b26b46c2cc0a2f57628a12ea2f7363f3
2020-04-13 03:00:51 +00:00
TreeHugger Robot
c56bcb5e7f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev 2020-04-13 02:45:04 +00:00
TreeHugger Robot
0b653fe083 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872
Change-Id: Ibd5efd60fdd6c4678d95b3e41e9bd0c4e45330ac
2020-04-13 00:49:42 +00:00
Robert Luo
afb01f12cd Fix NFC UI is not available when switching to 2nd user
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
2020-04-12 15:27:18 +08:00
Hiroki Sato
0e75d475ec Hide Bluetooth, Reset, Accessibility Settings in ARC
This is an upstreaming change of http://ag/8541963 and
http://ag/10296201 to hide some items from settings search.

This CL also adds javadoc to some settings classes to fix pre-upload
warnings.

Bug: 153704887
Test: Manual. In ARC build, "bluetooth" and "accessibility" no longer shows related settings.
Change-Id: Ic3e9217944251adbea1bdd67baf66d3a9e89583a
2020-04-10 16:00:57 +09:00
Treehugger Robot
ff9a2901f6 Merge "Usb preference title changed when rotating" am: fb2690102b am: b2c2d6e968
Change-Id: If0734764d1859e72edd2056c55a800a3742c5761
2020-04-06 14:16:52 +00:00
Xinli Zhang
4497c4d3bf Usb preference title changed when rotating
Rotate usb preference screen from horizontal to landscape
or vice versa. USB preference screen title changes.

Bug: 152895735
Test: manual
Change-Id: Ib8493662ab68146f0b5470936a8ba97a058c2a6d
2020-04-01 10:05:48 +02:00
Edgar Wang
0934babbfc Make the fragment title can’t searchable
we shouldn't take users so deep into the settings IA because it's easy
to feel lost in settings after clicking on a result without additional
context.

Bug: 143055215
Test: robotest & manual
Change-Id: I337cb5ead31e1e4e7bf9be78132e90630f83ee43
2020-02-06 19:07:11 +08:00
robertluo
81c79bb239 Merge Tap & Pay settings entries with NFC
Bug: 142231537
Test: make -j42 RunSettingsRoboTests
Change-Id: I54ea0cdf711f2c381f5bba8575fc22bd6329f3c6
2020-02-06 12:15:39 +08:00
Edgar Wang
e19ee9a01f Revert "Settings search - Navigate user to exact page"
This reverts commit 08f2a58459.

Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.

Test: robotest

Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
2020-01-16 14:07:38 +08:00
Jason Chiu
2d609759cd Add preference click metric logs for some special cases
Bug: 137559984
Test: visual, robotest
Change-Id: If8624b49abcd0000487065160ce4a7ba861f234c
2020-01-02 17:45:23 +08:00
Edgar Wang
08f2a58459 Settings search - Navigate user to exact page
- remove duplicate index preference
- default set searchable = false when the preference has fragment
- make some fragments indexable

Bug: 143057584
Test: robotest & manual

Change-Id: I4d64f6106d2f92f0a45e8c7e26388677f593f412
2019-12-24 21:04:11 +08:00
Tsung-Mao Fang
09acbecb76 Fix overlay problem on USB fragment
Raise the height of action bar while scrolling the view.

Test: visual
Change-Id: Id34df6a2f67e74dc1bb6db696976b11879154602
Fix: 146483904
2019-12-24 13:18:04 +08:00
TreeHugger Robot
e496d7e411 Merge "Fix talkback will not speak correct status" 2019-10-16 12:25:02 +00:00
hughchen
946c6f0dfe Update string
Change the headers from:
"Available media devices" → "Media devices"
"Available call devices" → "Call devices"
"Currently connected" → "Other devices"

Bug: 110920548
Test: manually
Change-Id: Idf283576353c9f65caa15ba8beca39f24721caa5
2019-10-14 16:16:24 +08:00
hughchen
b717295914 Fix talkback will not speak correct status
Update the UI in advance when user select any option. In this
CL before, the UI update in advance only when user select "USB tethering".

Bug: 141161849
Test: make -j42 RunSettingsRoboTests
Change-Id: I1fa4b20408a00b06d7c8fac6136c63df7406154d
2019-10-09 16:17:26 +08:00
hughchen
d6ec2ac7be Tethering shouldn't indicates on when SIM without tethering option
Before this CL, If SIM doesn't have tethering option then UI will not
back to previous option when press "USB tethering" in
[Default USB configuration].

This CL added receiver to observe USB state that get correct state
from UsbManager.

Bug: 138630479
Test: make -j42 RunSettingsRoboTests
Change-Id: I6cc8da508f6ab142142ca8c28460125bad93925b
2019-10-04 15:41:45 +08:00
Raff Tsai
966fa01423 Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
2019-09-25 18:24:56 +08:00
Raff Tsai
ac3e0d0988 Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
2019-09-24 00:35:52 +08:00
Raff Tsai
1f30b1cd67 Merge similar BaseSearchIndexProvider code together
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
2019-09-12 11:09:09 +08:00
TreeHugger Robot
33051103c6 Merge "Use FooterPreference in xml explicitly" 2019-08-15 15:47:24 +00:00
Sunny Shao
bd7a034ae3 Use dynamic footer
Removed the FooterPreferenceMixin from the UsbDefaultFragment page.

Fixes: 139460691
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.connecteddevice.usb
Change-Id: Iadf1d4893019827077875d02e3ebe380662aeb2c
2019-08-15 17:42:25 +08:00
Sunny Shao
49ffd8f39f Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the BluetoothDashboardFragment page.

Fixes: 139459430
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.connecteddevice
Change-Id: I8a8b6ba656405f938e203e20e5973c1560c3a35a
2019-08-15 08:48:47 +00:00
Raff Tsai
71a37d138b Import RadioButtonPreference from SettingsLib
Bug: 138620011
Test: manual, robolectric
Change-Id: I3b8a2be021a1b4a07aae61483f2329b7a5bd4655
2019-08-01 07:16:55 +00:00
tmfang
ec83f48e0d Use FooterPreference in xml explicitly
We don't rely on FooterPreferenceMixinCompat
to create footer preference in dashboard fragment.

Instead, declare a FooterPreference explicitly in
xml of screen.

Test: visual, robotest
Bug: 124129485
Change-Id: I4c5b60c3926583eb0d9f0d4cd6996bf169d6408c
2019-06-25 16:48:51 +08:00