Commit Graph

122483 Commits

Author SHA1 Message Date
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
6d591f5b5c Merge "Fix ImeiInfoPreferenceControllerTest" into udc-dev am: fec25d4bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22896675

Change-Id: I162a3dd40f6cda7ccbcef87703b1c5c76843f4dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 12:30:19 +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
028c16242d [automerger skipped] Merge "Revert "Back up the smooth display setting"" into udc-dev am: 060a56468d -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history

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

Change-Id: I00d026fd81ea149d062d0e2f363225b72669e6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 10:11:33 +00:00
Piotr Wilczyński
2471b9f543 [automerger skipped] Revert "Back up the smooth display setting" am: eef23f441c -s ours
am skip reason: Merged-In I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b with SHA-1 139bc341f3 is already in history

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

Change-Id: Id89bf2cffbf4544399992568a1997df4e1ce5f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 10:10:39 +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
386b3b662b 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: I94a6521cf1967c028faa657228cc909f2b1b3895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 06:09:16 +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
283bea4dd0 [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: I798960082e851991561c9a836592df2111cd1ad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:25:10 +00:00
Zaiyue Xue
92c94ed6e9 [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: I15144b4f05a33aafdc609d3e02654e5f34b752e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:24:58 +00:00
Tom Hsu
39b150171b 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: I49425eb7c992008e5dc7f0d028c82e4bee41038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 03:23:39 +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
75997c0291 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia77f9d73eb09f3b732bb573c285f0a708bdc6d48
2023-04-27 15:15:59 -07:00
Bill Yi
4aaf3c69d2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id35f9662e9184f7c027ed947fc025da452f5f5de
2023-04-27 15:00:42 -07:00
Bill Yi
af0651b602 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie83d53a350c848bb4cf4aaa63ec18470332526db
2023-04-27 14:52:34 -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
4792f21e3d 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: Ib02eef795ee140bb9241dadfb25749937fb8a774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:48:04 +00:00
Julia Tuttle
2094622da9 Merge "Update FSI permission strings" into udc-dev 2023-04-27 20:03:56 +00:00
TreeHugger Robot
9e2e3e9ae6 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: I16732ae62948cd37f654d03739fc21973f9c754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 19:25:08 +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
859df31fab 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: I0c2ed2c4f1fc8763cae49572f75d8871b5e48ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:11:41 +00:00
Becca Hughes
3107fb0f96 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: Ifde2d297be711a957ce900ec5c7f1d30601bc6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:11:36 +00:00
Becca Hughes
6df62b695c 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: I78f3ef0ab0e136e5e037b077fb993ebd9df8ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:04:37 +00:00
Becca Hughes
7378d6c66c 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: I2c3cdf15907f2e6e2a40a2547b9b6b92cdcfd35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:04:31 +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
Piotr Wilczyński
0066bdea3e Merge "Revert "Back up the smooth display setting"" into udc-d1-dev 2023-04-27 16:06:37 +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
143f6aeb43 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: I193bbf41ec079e0266357de47661e083594d3fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:29:05 +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
9e1c1ecca5 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: Icf963af6f2d5a931b678226970cde5701edb19fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:10:16 +00:00
Menghan Li
e9427458a9 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: Iaf75b768f12728be4d6d249dd9f26ed0efeaa21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:10:01 +00:00
TreeHugger Robot
795f3d2d09 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: I61fa48523f8462a156b13d63d14035edd1dc4c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 11:08:50 +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
f566e6de2f Merge "Update battery saver footer string" into udc-dev 2023-04-27 10:29:25 +00:00
Edgar Wang
4cf60b02b2 Fix test cases failed in WinscopeTraceTest
Fixes: 276682211
Test: autotest
Change-Id: Id31d5c4e2e1dd61c4af24e042f4aaddee3d33439
2023-04-27 10:22:29 +00:00
Zoey Chen
b306c4dd5b Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: Id9c1c34ea8496bb36512740efa81903af455154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:06:36 +00:00
Zoey Chen
c9994c0a54 [Regional Preferences]] Update the string of header
Bug: 279549042
Test: local test
Change-Id: I4983618c91f0e5ea83c4095491be7bb4433f6d2b
2023-04-27 09:44:17 +00:00
Zoey Chen
bee241bd5a Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev 2023-04-27 09:35:24 +00:00
Zaiyue Xue
8888e5eea7 Change drop down strings to "View by ..."
https://screenshot.googleplex.com/8J4KQW9FKB9yjsL.png

Bug: 279654750
Fix: 279654750
Test: manual
Change-Id: Ia66db0910b318b1e819960d08294a4303497b3e7
2023-04-27 17:33:04 +08:00