Commit Graph

87819 Commits

Author SHA1 Message Date
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
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
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
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
TreeHugger Robot
69f2a456b0 Merge "Support configurable multi-stage UDFPS enrollment" into sc-v2-dev am: dd28640c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15875914

Change-Id: Ia6fce74c79b01442273fbf733141de68695dd7b2
2021-09-22 07:48:00 +00:00
TreeHugger Robot
dd28640c0e Merge "Support configurable multi-stage UDFPS enrollment" into sc-v2-dev 2021-09-22 07:32:28 +00:00
TreeHugger Robot
589da8c3f9 Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev am: 6263fd9471 am: c19d945d4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860293

Change-Id: I9f5f8f43c9c1e7bc4379437657f90d210162596b
2021-09-22 06:49:29 +00:00
TreeHugger Robot
b63f60f87d Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev am: 6263fd9471 am: 03f1947b2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860293

Change-Id: I95aeac99a8c8da059dc3957f6fa488ba888c905e
2021-09-22 06:48:58 +00:00
TreeHugger Robot
c19d945d4a Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev am: 6263fd9471
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860293

Change-Id: I9654d63716d62d83244c96dfb08548623686fbc7
2021-09-22 06:36:58 +00:00
TreeHugger Robot
03f1947b2c Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev am: 6263fd9471
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15860293

Change-Id: I4fd211c5e1bab04677aacda77728c732b7de89ca
2021-09-22 06:36:33 +00:00
TreeHugger Robot
6263fd9471 Merge "Minor change to Wi-Fi WPA3 password length restriction" into sc-qpr1-dev 2021-09-22 06:25:24 +00:00
Zoey Chen
1a4f114c67 Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e am: 5db9f0042a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629

Change-Id: I1b9334726d75c8fa3229e4ae9a3e492a627ae4a6
2021-09-22 06:21:38 +00:00
Zoey Chen
0817b1053b Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e am: ab18c8ac04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629

Change-Id: I1be0cd9d16e5a11a1be2fc127c1f85b450381412
2021-09-22 06:21:04 +00:00
Zoey Chen
5db9f0042a Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629

Change-Id: I80712b16464d2104e570038060044bde74c9c4fb
2021-09-22 06:07:00 +00:00
Zoey Chen
ab18c8ac04 Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev am: 39b6769e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15834629

Change-Id: Iaa62b3be6f11eaa86b3d7b547f3e896e9bee5f9e
2021-09-22 06:06:57 +00:00
Zoey Chen
39b6769e5e Merge "[Provider Model] The SIMs page should list all p-SIMs" into sc-qpr1-dev 2021-09-22 05:53:36 +00:00
Wesley.CW Wang
803e3d710b Add PowerSaveWhitelistExceptIdle as Optimizted modes condition am: e7cca4cd81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15836295

Change-Id: Id84f334ae11660a24d89d1bd6b9fdd7465cd0d44
2021-09-22 03:43:01 +00:00
Wesley.CW Wang
e7cca4cd81 Add PowerSaveWhitelistExceptIdle as Optimizted modes condition
- Check PowerSaveWhitelistExceptIdle list before update each apps
 optimizaton mode to avoid duplicate remove action
 - Make those apps which under PowerSaveWhitelistExceptIdle list keep at
 optimized mode only

BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change


Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3cd10cf51b5132fc12a83e9554801ec4e8578cd1
Merged-In: I3cd10cf51b5132fc12a83e9554801ec4e8578cd1
2021-09-22 02:14:05 +00:00
Joshua Mccloskey
f3d56134dc Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a am: e5644441dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: I8b2f8dff4498866d44b617ece7f19e4ba2593745
2021-09-21 23:04:12 +00:00
Joshua Mccloskey
f73fad2d0f Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a am: 8aeeb6cd45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: I7699f33527edf8c395abb999767885b488fe0a58
2021-09-21 23:03:49 +00:00
Joshua Mccloskey
e5644441dd Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: I562c8f686ca963d5f9d8aba306b6d2ec0c0ca102
2021-09-21 22:52:39 +00:00
Joshua Mccloskey
8aeeb6cd45 Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923

Change-Id: Ib9d449b5e3b4565a6bad54141ccad8491bfb6630
2021-09-21 22:52:34 +00:00
Joshua Mccloskey
21ad438f6a Merge "Updated settings preference title for work profile" into sc-qpr1-dev 2021-09-21 22:39:56 +00:00
Curtis Belmonte
73855e0a59 Support configurable multi-stage UDFPS enrollment
Implements multi-stage enrollment for UDFPS. This implementation
supports both highlighting the progress bar when a help message is
received and configuring the progress thresholds between enroll stages
via an XML resource.

Test: Manual

Bug: 198928407
Bug: 200076382
Change-Id: Ied4dbcb4a523f477c5ca1a9146d24751c6473f35
2021-09-21 10:58:24 -07:00
Zoey Chen
95db7ae728 [Provider Model] The SIMs page should list all p-SIMs
- We do not support multiple pSIMs until now, so we need to get all p-SIMs from SubscriptionManager
- Apply same checking for downloaded sim

Bug: 199032142
Test: vendor test
Test: atest NetworkProviderSimsCategoryControllerTest and atest NetworkProviderSimListControllerTest
Change-Id: I77d7c52e73ac4e5d09fa3f3926490d7f8f8b0913
2021-09-21 17:29:27 +00:00
vichang
e4ccdef15a Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd am: e6bf1a83d8 am: b9bebd5bd9 am: eca37a8849
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: Ibcbd24530e7e94a2941d840701158457bbcde835
2021-09-21 11:31:11 +00:00
vichang
eca37a8849 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd am: e6bf1a83d8 am: b9bebd5bd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: Ie407f4d20b32fce153c2af8d17b65fda7725a6c8
2021-09-21 11:16:42 +00:00
vichang
b9bebd5bd9 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd am: e6bf1a83d8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: If94d8a65c9902180466481f157224a5389d9b117
2021-09-21 11:06:23 +00:00
vichang
e6bf1a83d8 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: I458bf767bbea8b5921f00afae884d309d270f7b0
2021-09-21 10:52:53 +00:00
vichang
3166166bdd Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" 2021-09-21 10:42:27 +00:00
Jason Hsu
22015ac5c5 Merge "Use the correct pageId for the existing accessibility page" into sc-v2-dev am: e9cea6a4aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785738

Change-Id: Ib0fc4934d24e08086fa8fb50e86c302750d783d4
2021-09-21 10:16:36 +00:00
Jason Hsu
e9cea6a4aa Merge "Use the correct pageId for the existing accessibility page" into sc-v2-dev 2021-09-21 09:59:58 +00:00
TreeHugger Robot
437ed9fa46 Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa am: 949b349912
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I9d84b1a416705b30a8cca09b16a08bd84c35db8e
2021-09-20 19:54:01 +00:00
TreeHugger Robot
654c3279f9 Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa am: a82b6cd01e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I411ba36f37c5f9a79d47b9e27b60de6b44e3d62c
2021-09-20 19:53:04 +00:00
TreeHugger Robot
949b349912 Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: Ie8392b9c08592411b5a7279459adb56da1698225
2021-09-20 19:42:05 +00:00
TreeHugger Robot
a82b6cd01e Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I211127b96a7f675dcf7b907d261a19d1311b33ea
2021-09-20 19:41:51 +00:00
jasonwshsu
746f4d45f7 Use the correct pageId for the existing accessibility page
* correct page id for "Accessibility timeout" and "Select to Speak"

Bug: 190344664
Test: build pass
Change-Id: I3f6b2c389c1ca77e4d3fca3601915caa7a9dd6f8
2021-09-20 19:29:27 +00:00
TreeHugger Robot
9dbe775faa Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev 2021-09-20 19:19:54 +00:00
TreeHugger Robot
d9015e0e70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours am: 2e1b4f12c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib22874dfbb313ad153087a48b6834947c004880c
2021-09-20 15:01:02 +00:00
TreeHugger Robot
87cdc11a39 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: 3fa671bab4 -s ours am: 3c18081292 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id56f83a34ac65b2a7d4ae6c479d6f180389932e2
2021-09-20 15:00:46 +00:00
Bill Yi
1eb125f2b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours am: 610ee5240d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8881900b12a83e6561040f69b3d84369e486c518
2021-09-20 15:00:04 +00:00
TreeHugger Robot
25a2a58fa2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours am: b65f46dce2 -s ours am: e860099488 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09cf2a67c440dde9ca9e4fee25a082af17fb79f6
2021-09-20 14:59:16 +00:00
Bill Yi
6ad471e64f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours am: 79c2a1e72e -s ours am: 34bbccd412 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I950f4e11b6b37d14a9b72c2c40363cc6b558aab8
2021-09-20 14:58:47 +00:00