Commit Graph

14170 Commits

Author SHA1 Message Date
TreeHugger Robot
98c4b64d1b Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81 am: 7bdfb34b7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028

Change-Id: I7b9204f3ae765b442f8dbedaac102a4fd9bc2846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 20:08:39 +00:00
TreeHugger Robot
7bdfb34b7b Merge "Ignore CRLF strings in display SSIDs to avoid display errors" into tm-qpr-dev am: 9447ec6d81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19168028

Change-Id: I37125c165dbb9d48d672666512faec8248bce5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-06 19:49:52 +00:00
PETER LIANG
0e887c9fb0 Merge "Avoid the reset item having inconsistent alignment with the others under SuW." 2022-07-05 14:58:38 +00:00
Peter_Liang
772e114438 Avoid the reset item having inconsistent alignment with the others under SuW.
Replaces the LayoutPreference with native Preference for the reset preference which is used for resettings the status of all preferences.

Bug: 232528123
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest,TextReadingResetPreferenceTest
Change-Id: I00719f13dc78039269ee373c6b35e12e7ff595ce
2022-07-05 15:32:37 +08:00
Weng Su
08adf4c2ed Ignore CRLF strings in display SSIDs to avoid display errors
- Keep user-entered SSIDs in Wi-Fi Configuration

- Ignore CRLF strings in display SSIDs only

Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
TreeHugger Robot
ae9c414092 Merge "Add test cases for highlight Preference click behavior" 2022-07-04 13:08:53 +00:00
Arc Wang
69974d0c4f Add test cases for highlight Preference click behavior
On large screen Activity embedding devices, Settings homepage
shows a highlighted Preference which is mapped to current
right pane.

For better UX, when users click again on a highlighted Preference,
it should not launch SubSettings.

Fix: 236275503
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard.DashboardFeatureProviderImplTest
Change-Id: I222c9b015fb090f359c3c9f4187823477920715b
2022-07-04 18:20:22 +08:00
Menghan Li
9450735e38 Merge "Refactor CaptionPropertiesFragment to improve maintainability" 2022-06-30 03:48:33 +00:00
menghanli
1d26b6d898 Refactor CaptionPropertiesFragment to improve maintainability
Root cause: There is a bunch of different logic of preferences in CaptionPropertiesFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionPropertiesFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionPropertiesFragmentTest CaptionTogglePreferenceControllerTest
Change-Id: I7013a7aa284b587c329c2e678dbb079e553ea94d
2022-06-30 09:01:13 +08:00
Menghan Li
5a3498c9bc Merge "Refactor CaptionMoreOptionsFragment to improve maintainability" 2022-06-30 00:16:54 +00:00
menghanli
deb72e29ef Refactor CaptionMoreOptionsFragment to improve maintainability
Root cause: There is a bunch of different logic of preferences in CaptionMoreOptionsFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionMoreOptionsFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionMoreOptionsFragmentTest CaptionLocalePreferenceControllerTest
Change-Id: Ifdf3e22b027328a9f8eb13d756730ca047ece047
2022-06-30 00:16:19 +00:00
Liahav Eitan
21d6249393 Merge "Load work apps in RecentAppStatsMixin" 2022-06-28 15:46:45 +00:00
Liahav Eitan
82e81e23e0 Load work apps in RecentAppStatsMixin
This change will show work apps and personal apps together in the
recent apps settings page, sorted by decreasing last usage time.

Test: see both work and personal apps in the recent apps page in the
correct order.
Fix: 146921442

Change-Id: I174a556010529bc39c085cc006722bc2947535bd
2022-06-28 13:20:36 +00:00
SongFerng Wang
6e7c0eee58 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d am: 8a00f325f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I466d8c2a5298d0821d71263b929b406b047ca955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 07:11:09 +00:00
SongFerng Wang
8a00f325f4 Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9 am: c150fe528d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: Icfcdf386740d4ad79d45923a9a0fce5c4306a5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 06:35:52 +00:00
SongFerng Wang
c150fe528d Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9 Merge "Fix the testcase error" into tm-d1-dev 2022-06-28 05:57:21 +00:00
SongFerngWang
cefad1e4b7 Fix the testcase error
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-27 20:42:31 +08:00
menghanli
e862d44e15 Setup AccessibilitySettingsForSetupWizard test infrastructure
Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilitySettingsForSetupWizardTest
Change-Id: I9438f770bfe2ef5f03206fc4645e77bab6328cc6
2022-06-27 08:45:08 +08:00
Menghan Li
a8474f572b Merge "Setup ToggleScreenMagnificationPreferenceFragmentForSetupWizard test infrastructure" 2022-06-26 23:44:37 +00:00
Menghan Li
4abeb53b76 Merge "Setup ToggleScreenReaderPreferenceFragmentForSetupWizard test infrastructure" 2022-06-26 23:44:24 +00:00
Menghan Li
7c37d8a6f6 Merge "Setup ToggleSelectToSpeakPreferenceFragmentForSetupWizard test infrastructure" 2022-06-26 23:44:08 +00:00
SongFerng Wang
48333f57cc Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 0018589f09 am: 6293d2a103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I76826b0908d8a9b307087b1bc9a4ea7d6251d6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:41:46 +00:00
SongFerng Wang
6293d2a103 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 0018589f09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: Ifb31acb46471b17244ad806986be4ba6c0bed56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:24:01 +00:00
SongFerng Wang
0018589f09 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f Merge "The UI only shows the active LE device" into tm-d1-dev 2022-06-26 16:38:24 +00:00
TreeHugger Robot
3993aa5688 Merge "Fix UI flicker problem and update wordings" 2022-06-24 10:07:05 +00:00
Menghan Li
a9bc498a11 Merge "Setup AccessibilityButtonFragment test infrastructure" 2022-06-24 07:11:13 +00:00
Evan Chen
fc86787927 Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev am: bd2b5e7bfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18744660

Change-Id: I45cdf05096add05a6702a703fc9287f0237bb8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 04:52:37 +00:00
Evan Chen
bd2b5e7bfb Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev 2022-06-24 04:25:49 +00:00
Salud Lemus
b73edf84ff Merge "Add unit tests for verifying title" 2022-06-23 17:17:38 +00:00
Evan Chen
ad21a7ac9d Merge "Update AssociationIno creation for Bluetooth test" 2022-06-23 16:46:28 +00:00
menghanli
c3163bc813 Setup ToggleScreenMagnificationPreferenceFragmentForSetupWizard test infrastructure
Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest
Change-Id: I5715feb355bace402043f82f0eb09b96fa3810cf
2022-06-24 00:10:10 +08:00
menghanli
6965348fd8 Setup ToggleSelectToSpeakPreferenceFragmentForSetupWizard test infrastructure
Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest
Change-Id: Ib98c9e20533939a32abc1bc15809f0edf61b46f8
2022-06-24 00:09:23 +08:00
menghanli
769450dd35 Setup ToggleScreenReaderPreferenceFragmentForSetupWizard test infrastructure
Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenReaderPreferenceFragmentForSetupWizardTest
Change-Id: Iae397049e156c7cb4c7a98a128653f9a8734000c
2022-06-24 00:06:52 +08:00
menghanli
bf91f212b8 Setup AccessibilityButtonFragment test infrastructure
Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityButtonFragmentTest
Change-Id: I773579c8f2dcb0f8ebf154b584f8618f2ec1968b
2022-06-23 21:37:55 +08:00
Sunny Shao
d46dff8d4f Fix UI flicker problem and update wordings
- "Set time zone automatically" changes to "Set automatically".
- "Use location to set time zone" changes to "Use location"
- Add a new summary text with "Location may be used to set time zone".

Fixes: 233968737
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.datetime
Change-Id: Ia16c428e906cda4ebe052bad83c3f574075a7a64
2022-06-23 10:52:23 +08:00
Salud Lemus
54cb55b87e Add unit tests for verifying title
Bug: 236259020
Test: m RunSettingsRoboTests ROBOTEST_FILTER=EnterprisePrivacySettingsTest

Change-Id: I520c94818951acce25c5d8a090b6d59feff93a1c
2022-06-22 17:18:10 -07:00
Oriol Prieto Gascó
7e7df0d9b5 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 am: 95d32d678c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: Idae7664b658f8057b30b9bcc50379d0cb11845fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:38:06 +00:00
Oriol Prieto Gascó
95d32d678c Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
f53df5fed1 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 930ccdecef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I7731eed119f366ec0bb31eb74e75f83cdd8a0a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:12:13 +00:00
Oriol Prieto Gascó
0dfc94f668 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 17:45:17 +00:00
TreeHugger Robot
0aaeabdfc0 Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725 am: 3997ccc2ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990

Change-Id: I7d9d027fa54ba90b7a5c4a290a168de01496e063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 17:26:16 +00:00
TreeHugger Robot
3997ccc2ee Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990

Change-Id: Iac11c8a9834528d81cb757a85a5bcaed7c8b8035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 17:06:42 +00:00
TreeHugger Robot
2d0e1dc725 Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev 2022-06-21 17:04:33 +00:00
SongFerngWang
6426382e90 The UI only shows the active LE device
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-20 21:30:34 +08:00
Zaiyue Xue
7e6aa69cca Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2 am: 6470ada117
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3d6a155e80a5d54c309061c41d0b6436e61cc4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:42:01 +00:00
Zaiyue Xue
6470ada117 Merge "Move battery usage files to a separate folder." into tm-qpr-dev am: 3b7953eac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18797446

Change-Id: I3e0ae9d1922b8d6f55721ec3357d529a58a56dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 09:32:47 +00:00
Zaiyue Xue
3b7953eac2 Merge "Move battery usage files to a separate folder." into tm-qpr-dev 2022-06-20 09:12:04 +00:00
Oriol Prieto Gasco
f528e7de49 Use com.android.bluetooth as the BT stack APK
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
2022-06-19 23:06:06 +00:00