Commit Graph

95708 Commits

Author SHA1 Message Date
Eric Laurent
eb79498e0f Merge "Fix error prone build with spatial audio settings test" into sc-v2-dev 2021-09-23 14:37:32 +00:00
YUKAI HUNG
ac19d0e300 Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle" into sc-v2-dev am: b62c1e8142 am: f488cf5416
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15892826

Change-Id: I69fa32b26f7674366be9fa4b0807d9b0fe2c54a4
2021-09-23 11:47:14 +00:00
YUKAI HUNG
f488cf5416 Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle" into sc-v2-dev am: b62c1e8142
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15892826

Change-Id: I5050b2e16522f19e4cdd04e317a2118ea881f322
2021-09-23 11:34:07 +00:00
YUKAI HUNG
b62c1e8142 Merge "[B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle" into sc-v2-dev 2021-09-23 11:24:19 +00:00
Bonian Chen
c61b4bcb29 Merge "[Settings] Ignore failed test case" 2021-09-23 10:50:26 +00:00
ykhung
9de5fe158d [B&R] avoid to backup & restore app which is in the PowerSaveWhitelistExceptIdle
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name

Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
adb shell bmgr restore 3e9867a7660315b8 com.android.settings

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I78f34870af3146698e6d1b9fbc5ec4385a8d5384
2021-09-23 17:29:22 +08:00
Tsung-Mao Fang
b57265fa31 Revert "Move Automatic System Updates from Developer Options to ..."
Revert submission 15552651-cherrypick-automatic-system-update-n9jr24y6ba

Reason for revert: Legal team decided to have this entry in GMS, so we can move this setting item back.
Reverted Changes:
Iaea3e11d9:Move Automatic System Updates from Developer Optio...
I077607a6a:Move Automatic System Updates from Developer Optio...

Change-Id: If000388f2dd0f9e3e06a29dcbdd362181d1bfd47
Bug: 196297425
2021-09-23 09:26:58 +00:00
TreeHugger Robot
2d5178e62b Merge "Show the multiple Mac address for the coordinated set" 2021-09-23 08:40:55 +00:00
Alice Kuo
133c2cc1cc Show the multiple Mac address for the coordinated set
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.

Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV

Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
2021-09-23 08:31:07 +00:00
TreeHugger Robot
cf889e2faa Merge "Fix not able to add Settings shortcut widget problem" into sc-v2-dev am: 7655d161ff am: f6bdd8eb96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15892809

Change-Id: I98c474c935559b41f9eab8a70c19bb9daffaeb5f
2021-09-23 08:25:02 +00:00
TreeHugger Robot
f6bdd8eb96 Merge "Fix not able to add Settings shortcut widget problem" into sc-v2-dev am: 7655d161ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15892809

Change-Id: I2a982c636bcf7b7709c697a3bfaaa41e5999bbeb
2021-09-23 08:12:32 +00:00
TreeHugger Robot
7655d161ff Merge "Fix not able to add Settings shortcut widget problem" into sc-v2-dev 2021-09-23 08:02:23 +00:00
Eric Laurent
bab4074204 Fix error prone build with spatial audio settings test
Add cast when getting AudioManager per
https://errorprone.info/bugpattern/MockitoCast

Bug: 191870827
Test: make
Change-Id: Icf93e68ec373f9ce145440f97fbe8d02c1716983
2021-09-23 09:52:10 +02:00
Jason Hsu
1ed5b468f4 Merge "Support ability to add different page id for different accessibility service page in settings." into sc-v2-dev am: 768722fed4 am: da247a3042
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824482

Change-Id: I58f6e45441389cd1d54d5399aa48c219d4a81ed4
2021-09-23 07:26:46 +00:00
Bonian Chen
ab9428f315 [Settings] Ignore failed test case
Ignore failed test case.

Bug: 200906425
Test: build pass
Change-Id: Iacd21b22b3971388add17ca559135473385b8c91
2021-09-23 15:21:36 +08:00
Jason Hsu
da247a3042 Merge "Support ability to add different page id for different accessibility service page in settings." into sc-v2-dev am: 768722fed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824482

Change-Id: I8d5053da73433f54491fe9e32f822757d09057ef
2021-09-23 07:12:16 +00:00
Jason Hsu
768722fed4 Merge "Support ability to add different page id for different accessibility service page in settings." into sc-v2-dev 2021-09-23 07:01:58 +00:00
TreeHugger Robot
58edb69d46 Merge "Add the Spatial audio toggle in SoundSettings" into sc-v2-dev am: a448a917eb am: edc5e940ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15884455

Change-Id: Iedbf25f530937ae35e7b772873df994036c1d237
2021-09-23 06:55:21 +00:00
Curtis Belmonte
cd2990bdb3 [automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3 am: e04555bc68 -s ours am: af3547a96d -s ours
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332

Change-Id: Id1ebe6481ffd1a37f13e12bbdd7e44e972e56847
2021-09-23 06:54:37 +00:00
Arc Wang
4dd3f11349 Fix not able to add Settings shortcut widget problem
After users select a shortcut item in CreateShortcutActivity,
launchers need to get result from CreateShortcutActivity.

For large screen devices, Settings deep link will start
DeepLinkHomepageActivity and then DeepLinkHomepageActivity
starts the deep link page. The CreateShortcutActivity result
deos not forward to launcher and there is no shortcut added.

This change uses Intent.FLAG_ACTIVITY_FORWARD_RESULT to
forward result from CreateShortcutActivity to launcher.

Bug: 200889769
Test: manual
      Long click launcher -> Widget -> Settings ->
      select an item and check if it adds a short on launcher.
Change-Id: Idd5fc642be5c1fb2f747316c3ddcd9b7f0b33852
2021-09-23 06:54:36 +00:00
TreeHugger Robot
edc5e940ef Merge "Add the Spatial audio toggle in SoundSettings" into sc-v2-dev am: a448a917eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15884455

Change-Id: I82270db9e790b8f64f3c8cb7ed878ba0fd3ab025
2021-09-23 06:17:26 +00:00
TreeHugger Robot
a448a917eb Merge "Add the Spatial audio toggle in SoundSettings" into sc-v2-dev 2021-09-23 06:00:54 +00:00
Curtis Belmonte
af3547a96d [automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3 am: e04555bc68 -s ours
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332

Change-Id: I8db1198444f51dac647a719bee95866bd562e421
2021-09-23 05:37:54 +00:00
Jason Hsu
d2c58d835e Merge "Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory" into sc-v2-dev am: f7695aae33 am: 9e787479a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15836289

Change-Id: I0047af43a2a4fd872324720fecaced139b5811dc
2021-09-23 05:22:04 +00:00
Jason Hsu
9e787479a6 Merge "Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory" into sc-v2-dev am: f7695aae33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15836289

Change-Id: I34e04b0e990cf4e0eb6e9729f99d545a4f421edf
2021-09-23 05:08:33 +00:00
Jason Hsu
f7695aae33 Merge "Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory" into sc-v2-dev 2021-09-23 04:55:54 +00:00
Bonian Chen
67bffece6d [Settings] Enable kotlin language support
Enable the support of *.kt files.

Bug: 200896893
Test: build pass
Change-Id: I467e4ae3ecd94a74379daa41a8ee8ef4a038d75e
2021-09-23 12:51:26 +08:00
Alan Huang
e303658f0d Add the Spatial audio toggle in SoundSettings
The Spatial audio toggle will be showed only on supported devices

Test: robotest, manual checked the UI, but not the actual functionality due to
doesn't have supported device in hand

Bug: 191870827
Change-Id: I7db264902b03fddb7808676d8cb98cbe045deda1
2021-09-23 04:45:46 +00:00
TreeHugger Robot
239023d13d Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev am: 4223ee98ea am: e7ebddb87d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824476

Change-Id: I374926b60b58d2867dd9553bf962911a7493540c
2021-09-23 03:46:47 +00:00
TreeHugger Robot
e7ebddb87d Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev am: 4223ee98ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824476

Change-Id: I81f6a07456d2fbd3c10795caa5c0af2ef34fc1fb
2021-09-23 03:32:12 +00:00
TreeHugger Robot
4223ee98ea Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev 2021-09-23 03:19:09 +00:00
Arc Wang
e4084028b3 Merge intent extra to deep link intent target for large screen devices
Sender of deep link intent may want to send intent extra data to the
deep link target Activity by merging intent extra.

Bug: 197048599
Bug: 197926040
Test: manual
      1. Click quick Setting 'Internet button'.
      2. Click the gear button of a connected Wi-Fi.
      3. Observe if the Wi-Fi detail page shows the connected Wi-Fi.
Change-Id: I32040ee21a747cae710df2e12a8f5b66aff086fa
2021-09-23 02:05:55 +00:00
Peiyong Lin
9b072f6fb9 Update string to avoid using etc.
Per UX guideline, avoid using etc.

Bug: b/191525455
Test: Settings > Apps
Change-Id: I31daf801578cfca1cbb04b27154b6f2c83392727
2021-09-23 00:10:47 +00:00
Andrii Kulian
356292a1ee WM Jetpack interface update in Settings
Updating to the latest version of the library
that's added in the topic.

Bug: 199676595
Test: Build, install and test Settings
Change-Id: Ia08314a93c4b5263e2fb6c06a5b517a74e9e3745
2021-09-22 15:47:33 -07:00
Curtis Belmonte
e04555bc68 Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332

Change-Id: I0c658ef0ad208e912e88e2af82cf14d3ec34d245
2021-09-22 18:08:40 +00:00
Curtis Belmonte
491ef413c3 Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev 2021-09-22 17:52:47 +00:00
Bonian Chen
24dfc61f99 [Crash] finish activity without super#onResume()
When finish() an activity within onStart() or onResume(),
super#onStart() or super#onResume() need to be invoked prior to
finish().

Bug: 200513672
Test: local
Change-Id: Ifba0956fb3a11888c84f55342f62a3f192a67294
2021-09-22 22:34:23 +08:00
Arc Wang
70b2d88682 Merge "Fix sometimes deep link does not show in 2-pane" into sc-v2-dev am: 8ab5c92adc am: 93e09e46ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834628

Change-Id: I05c5d864ffed7b075ca66d532606e9f8ed484351
2021-09-22 14:01:48 +00:00
Arc Wang
93e09e46ba Merge "Fix sometimes deep link does not show in 2-pane" into sc-v2-dev am: 8ab5c92adc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834628

Change-Id: I93214f3af090d7bd695174e851d69c604d899d05
2021-09-22 13:49:23 +00:00
Arc Wang
8ab5c92adc Merge "Fix sometimes deep link does not show in 2-pane" into sc-v2-dev 2021-09-22 13:34:10 +00:00
jasonwshsu
3d0f12d043 Support ability to add different page id for different accessibility service page in settings.
Bug: 190344664
Test: build pass
Change-Id: I6cc90b27dcbb5075d13e3c59fe754309182b4d0a
2021-09-22 18:36:46 +08:00
jasonwshsu
01cc290446 Add the AccessibilitySearchFeatureProvider mock in testutils/FakeFeatureFactory
* Complete the missing part in ag/14299190

Bug: 184171842
Test: build pass
Change-Id: I020f218b58dca132bdb093163f764e125b8ea816
2021-09-22 18:36:17 +08:00
Arc Wang
7ffd6d8186 Fix sometimes deep link does not show in 2-pane
Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK starts
the activity-alias 'DeepLinkHomepageActivity', however,
if Settings app first time (from application cteation) starts
from the activity-alias 'Settings', framework will uses
'Settings' instead of DeepLinkHomepageActivity to match pair
rule. User will see full screen deep link for this case.

This change registers deep link pair rule for both the
activity-alias 'Settings' and 'DeepLinkHomepageActivity'.

Bug: 200131691
Test: manual
      1. Launch Settings from launcher.
      2. Launch Settings from Settings shortcut widget.
      3. Observe if the shortcut page shows in  2-pane.
Change-Id: Ice9d09f3545a02603f529d5d19e621ae82302004
2021-09-22 10:12:53 +00:00
TreeHugger Robot
42135204d1 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957 am: 6b5973c48e am: 6d17c92f16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: I325b306a11a543c9cfc6779da23fcbca6fd141ec
2021-09-22 09:40:35 +00:00
TreeHugger Robot
897d4d04a1 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957 am: 1fc8de7343 am: 24a1b8150b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: I9aec8a145e6f98feff7926a887fa03f7a9cf278a
2021-09-22 09:40:16 +00:00
TreeHugger Robot
6d17c92f16 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957 am: 6b5973c48e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: I386939b5835f1f9cbd7f35d78c561b2135988ffa
2021-09-22 09:31:56 +00:00
TreeHugger Robot
24a1b8150b Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957 am: 1fc8de7343
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: I62c2812fd8fc095bdf90ecf1595c62f1c42e953e
2021-09-22 09:31:12 +00:00
TreeHugger Robot
6b5973c48e Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: Ia5440a9db8bf15ced28fcca5de37e2a086cba41a
2021-09-22 09:22:02 +00:00
TreeHugger Robot
1fc8de7343 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: If671b194ea453ac406f280b5fdfe72d62cf1f550
2021-09-22 09:21:58 +00:00
TreeHugger Robot
85d20f5957 Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev 2021-09-22 09:08:25 +00:00