Austin Delgado
9b94905c63
Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev
2023-04-28 17:42:46 +00:00
TreeHugger Robot
6e524f6244
Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev
2023-04-28 17:01:39 +00:00
Bill Yi
4174b548cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033
Change-Id: Iea6d3ccd75a787447cde716ca4b027d4d5e5f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 16:48:53 +00:00
Edgar Wang
089e76c429
Fix test case failed in SystemControlsFragmentTest
...
Fixes: 280071271
Test: local robotest
Change-Id: I96867e9718b4a30289fdcd3fcd9dc70ed8c227b0
2023-04-29 00:42:45 +08:00
Ale Nijamkin
12e05b8c59
Fixes broken Settings test.
...
In ag/22187500, we added the requirement for a wallpaper picker app to be installed in order to treat the lock screen shortcuts feature as enabled (in addition to the feature flag). That broke this test.
To fix, we're adding a mocked result to the PackageManager to pretend like the wallpaper picker application is installed.
Change-Id: I8654375e3fa33df0984c48fcf91dd8f6c18e984f
Fix: 280017187
Test: the test is back to passing.
2023-04-28 16:22:59 +00:00
Gil Cukierman
be1fb77da5
Enable null cipher toggle by default
...
Test: atest GsmCdmaPhoneTest NullAlgorithmsPreferenceController
Test: Manual test on multiple targets and cf
Bug: 262063621
Change-Id: Ic10dbe552eb48eb19efc53e2430a7a1eb081a50e
2023-04-28 15:43:28 +00:00
Christian Göllner
b613cc4a17
SettingsRoboTests: fix device state rotation related tests
...
Fixes: 280015539
Test: atest SettingsRoboTests
Change-Id: I0a3cc713f8df0477a172665a60551b456691b17c
2023-04-28 15:26:32 +02:00
Edgar Wang
f411b62425
Fix PrivateDnsPreferenceControllerTest test case failed
...
- getAvailibilityStatus_availableByDefault()
Fixes: 280048011
Test: locoal robotest
Change-Id: I490dc3348af241a76767885b52238d0b87880532
2023-04-28 21:04:59 +08:00
Chaohui Wang
6be82a5ee6
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675
Change-Id: I71d802cf9ec3e3e686ed380f2b6d85271e0d964c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 12:31:03 +00:00
Chaohui Wang
fec25d4bad
Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev
2023-04-28 11:52:50 +00:00
himanshuz
dd26189e2c
Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default.
...
Bug: 253449368
Test: Manual by building and flashing
Change-Id: I9099019f2bd982588f12ac1741fce27d24e5849e
2023-04-28 11:10:14 +00:00
Treehugger Robot
ea1046bee7
Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22894948
Change-Id: Ie6244b8bdbc1a328bb72d359e88b581949d66809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 10:10:56 +00:00
Treehugger Robot
060a56468d
Merge "Revert "Back up the smooth display setting"" into udc-dev
2023-04-28 09:58:16 +00:00
Chaohui Wang
8470122ad1
Fix ImeiInfoPreferenceControllerTest
...
For test case updatePreference_simSlotWithoutSim_notSetEnabled,
mSecondSimPreference is a mock, instead of check the default value of
isEnabled(), verify it's setEnabled() not called.
Fix: 279880808
Test: RobolectricTest
Change-Id: I72064820754e053def46bdbf10317189c7ac608f
2023-04-28 15:53:44 +08:00
Edgar Wang
2d4d23ecb3
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012
Change-Id: I2060622fa99166cf0190bca4d41da7f255a8f337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 06:09:19 +00:00
Edgar Wang
8155b72cf8
Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev
2023-04-28 05:28:14 +00:00
Bill Yi
547484f797
Import translations. DO NOT MERGE ANYWHERE
...
BUG:278022447
Auto-generated-cl: translation import
Change-Id: I746cb0e511ad3e9a19f2dfb0d152319e53c7a11f
2023-04-27 20:47:48 -07:00
Zaiyue Xue
11abeff5e1
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours am: 18d5ebc38f
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I2dc70d83faa0bb2c145266367bd6ddb3cf572408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:24:26 +00:00
Zaiyue Xue
3cd1075bff
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours am: 27c242f01d
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: Iae245dba27f4bf8a7a8821224cb12c19bc6442a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:24:23 +00:00
Tom Hsu
2bc75c0d5d
Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844
Change-Id: Ia036cb77c011fb1c1258bef314818ec38beacd26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:21:52 +00:00
Zaiyue Xue
18d5ebc38f
[automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: I3cd68b222aa83eada95698d381880433c57b9fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:20:10 +00:00
Zaiyue Xue
27c242f01d
[automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7
-s ours
...
am skip reason: Merged-In Ia08dea791bb72113719fd1316e8e9587a96eaef1 with SHA-1 3d7b8b3bfe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696
Change-Id: Ic1b0667493cbf0009c71c2ea0cd67ef708d73698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 03:20:02 +00:00
Tom Hsu
bd9263b391
Merge "[Settings] UI part: Add metrics for language" into udc-dev
2023-04-28 02:49:59 +00:00
Zaiyue Xue
6aba166376
Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev
2023-04-28 02:43:00 +00:00
Bill Yi
aa051e78aa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I20c3b00ddbe6d1731ea0542cba63ccc9b3ca881e
2023-04-27 14:46:45 -07:00
Bill Yi
6ce6a33514
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id46773ac05790b09d8c6471111099efe5cbfa166
2023-04-27 14:41:29 -07:00
Bill Yi
2a7c30fb20
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idcb1e9a90118ad4583d0488c62e8e116e67bc56b
2023-04-27 14:39:03 -07:00
Julia Tuttle
3a68e5bf28
Optimize imports in AppNotificationSettings
...
Bug: 277938609
Test: builds
Change-Id: Id44390f6fc8b6294c951a7f4ec9bd37e0a364dfd
2023-04-27 17:24:14 -04:00
Julia Tuttle
ce59e1ea97
Merge "Update FSI permission strings" into udc-dev am: 2094622da9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255
Change-Id: Id797e3f7b2f1dec78f0bc529da0156393a27d2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 20:48:39 +00:00
Julia Tuttle
2094622da9
Merge "Update FSI permission strings" into udc-dev
2023-04-27 20:03:56 +00:00
TreeHugger Robot
d1ebd886db
Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040
Change-Id: I7a91a1346cdfa2a7ac1c37a99e5c109e05ec3088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 19:25:45 +00:00
TreeHugger Robot
32602794ed
Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev
2023-04-27 18:55:20 +00:00
Julia Tuttle
b2fd7b20c7
Update FSI permission strings
...
Change them to better align with the other "Special app access" screens.
Bug: 277938620
Test: none
Change-Id: I0083a207a9c8cf98d1b5a9927a1f8bf024832697
2023-04-27 14:02:01 -04:00
Becca Hughes
9a1743f99d
Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: I9b3744d2a589a171e77a6aa08439ffd12afc807f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:15:57 +00:00
Becca Hughes
2083d07121
DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: I5546461c6bb87b94dbf2d525e223e83b88b5d3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:15:52 +00:00
Becca Hughes
4c481b04c8
Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836
Change-Id: Ic5994457b10d61f254e2c0efab6a6c4ff8d76822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:06:55 +00:00
Becca Hughes
76e5f7fac4
DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836
Change-Id: Ia265b8c5cca1a6207ef7ba61342d66eb44db2373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:06:50 +00:00
Becca Hughes
c74ccee659
Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev
2023-04-27 16:35:18 +00:00
Becca Hughes
4fc5b0e7b3
Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev
2023-04-27 16:35:07 +00:00
Piotr Wilczyński
eef23f441c
Revert "Back up the smooth display setting"
...
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3
Reason for revert: b/279215664
Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3
Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
Merged-In: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
2023-04-27 16:13:03 +00:00
Zoey Chen
cfaa13442c
[Settings] UI part: Add metrics for language
...
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
2023-04-27 15:55:45 +00:00
Chaohui Wang
68d638707b
Fix Data Saver page crashed when rotate
...
This is because before fix mLoadAppRunnable is async run. And the
getContext() within it will return null when the Fragment in some not
ready lifecycle.
Use viewLifecycleOwner.lifecycleScope.launch to ensure the async
function will only be run when the view is ready, and automatically
canceled when out of scope.
Since this requires Kotlin Coroutine so migrate DataSaverSummary to
Kotlin, other functionality are keep no change.
Fix: 279863347
Test: Manual
Change-Id: I2e97a071c103e63b3306b801fc38f4704e3be0d2
2023-04-27 20:08:19 +08:00
TreeHugger Robot
29d3ac3432
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: Ib0f3fe11381620d4f699e1d622f1a095f5510aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:28:53 +00:00
TreeHugger Robot
d3897afda6
Merge "Change drop down strings to "View by ..."" into udc-dev
2023-04-27 11:12:45 +00:00
Treehugger Robot
4789bda4c3
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: Id47e3ab9934ca0c129340602ddad6e8b8c92c51f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:09:09 +00:00
Menghan Li
c3eebfe67e
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I3c97a4ec9962406e030747934f7b2895387a5cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:07:44 +00:00
Treehugger Robot
d12716bb12
Merge "[Regional Preferences]] Update the string of header" into udc-dev
2023-04-27 11:02:53 +00:00
Menghan Li
0e32500259
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev
2023-04-27 10:57:17 +00:00
TreeHugger Robot
1dd46754ea
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I0eb9118e28e66c8663dbde3915e321db9c166214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:36:52 +00:00
TreeHugger Robot
f566e6de2f
Merge "Update battery saver footer string" into udc-dev
2023-04-27 10:29:25 +00:00