Commit Graph

124776 Commits

Author SHA1 Message Date
Becca Hughes
3160236ab8 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 6df62b695c am: 55ceb266a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9032380336088565ed97eaecc61252c704bb0c0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 01:00:44 +00:00
Becca Hughes
2e0d30aaa6 [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 7378d6c66c am: 0c3e99a61d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1bac5b37afbccf907abbaf931cfc510129a93a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:59:48 +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
1d8c05bf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040 -s ours am: 9bb60a200e -s ours am: 9b25911c3c -s ours am: 7f61419889 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I082a6710c7767c6d35eb31bf0d09a719c30db7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:15:25 +00:00
Bill Yi
b4b54ad1e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours am: 49103dfc2e -s ours am: e62b917856 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic2f26a3b3439734358695de7f92d45a21eb100f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:15:12 +00:00
Bill Yi
94ad3348b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours am: 155b5266fc -s ours am: f9ffefd7d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8222b6716e1a709a7c00147315a3fa3636d59814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:52 +00:00
Bill Yi
078228b2dd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4f2357530e6783e8f44ccb3a891f7600b1c7808f
2023-04-27 15:14:49 -07:00
Bill Yi
598481dc76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours am: 0ebc9d790d -s ours am: d0e1438572 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f69589b68b55c89846c2c69c9b61db8709946fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:46 +00:00
Bill Yi
45808ae4a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours am: a70fa93e6b -s ours am: 58119147f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea2ea036cf7265564c10c6fe58f7f27cdcf3a136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:35 +00:00
Bill Yi
a3fc319181 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours am: 340b85bb5b -s ours am: cb6e618de8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0da7cce7b1078677ccbf143b3d010298d989afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:14:14 +00:00
Treehugger Robot
875b1be363 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours am: 46bd7feab6 -s ours am: 304324ddd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife399de8a85dbc27a4246d62dacf8b272f455e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:11:21 +00:00
Treehugger Robot
55c2d095cf Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9 am: 0b8d81c18c am: c4241ce611
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I6169c4ed513ae43ab30e9764b0d54ad96fffb95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:10:48 +00:00
Piotr Wilczyński
23ef7e7a3b Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e am: 1ab96c0b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: Iede2011f75063ca25002cbabf819f8a66ffa690f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:09:42 +00: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
5cb43822ba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I48766f4e3d149073295084599f9f82fe8e3f1432
2023-04-27 14:58:23 -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
Bill Yi
7b551f8fbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3ecbacb18921817de69d93abadebb7883acc6748
2023-04-27 14:47:53 -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
16015f0dfd Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: e2a8133da4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I717e48fdec86ba3e1feb06ad3dea2b100a86cf1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:36:37 +00:00
Julia Tuttle
ff3d30a9b4 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: ce59e1ea97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I7733171ec9db9f522bba6dad727cb766f178d4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:34:15 +00:00
Julia Tuttle
03b06d6ff1 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: 4792f21e3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Ic23004d25860bc1e7809587307131695c39665f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:33:43 +00:00
Julia Tuttle
3a68e5bf28 Optimize imports in AppNotificationSettings
Bug: 277938609
Test: builds
Change-Id: Id44390f6fc8b6294c951a7f4ec9bd37e0a364dfd
2023-04-27 17:24:14 -04:00
Becca Hughes
427665a90a [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 859df31fab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bc4d88c3619d37ccf7f27bf09d9de6dfbb7c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:21:58 +00:00
Becca Hughes
f166cb9796 [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 3107fb0f96 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia35448dcdd12c68b89be1a32e8107103a8f3da94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:15:59 +00:00
Becca Hughes
58105270d7 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 6df62b695c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5921ff3db32de96dcec26c8a8c84badee51a3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:06:31 +00:00
Becca Hughes
b1b6edc4dc [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 7378d6c66c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I546ea077e306c793cc57ac9bb96dccd584db4f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 21:05:55 +00:00
Piotr Wilczyński
9797fc8d15 Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: I3f3058996ac6418ce8df4e888b0959830276ac31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:53:05 +00:00
Julia Tuttle
e2a8133da4 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: Ib07fb63100747c1486f3d0cdf9c80549be65a028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:49:23 +00: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
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
TreeHugger Robot
4896c53060 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d4ceb73fe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I6b0bc4cddaf6ea52e45db658ec6ee7dce287b2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:23:57 +00:00
TreeHugger Robot
f48a328ac8 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: 9e2e3e9ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: Ib258aa7845d1da749b43cce636a489a8d844322e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:22:17 +00:00
TreeHugger Robot
bb49ef02f9 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d1ebd886db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I7007257549a53aabbede5faed635066bb8f82a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:22:15 +00:00
Julia Tuttle
2094622da9 Merge "Update FSI permission strings" into udc-dev 2023-04-27 20:03:56 +00:00
TreeHugger Robot
d4ceb73fe5 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: I2a13de79198afd67cb8e910aead7275b460df8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 19:27:17 +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
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
82296631cd Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924 am: 0469be62f0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: Ib86e796a246d7112adce01f229771fbb40e4f70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 19:09:09 +00:00
Treehugger Robot
7a86020bd8 Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b am: 83f2d27e35 am: 97c42d8736 am: e207694022
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510

Change-Id: I6c1f3d65c8a8786f13bc19a740b8a39f3dad7c03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 19:00:44 +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
Becca Hughes
94da380e34 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 8912f693f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Ic6211b6c06af1ca9a53f1b9595ff1a31f8790ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:22:39 +00:00
Becca Hughes
45c94c760e DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: c6a74847e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Ie05ba601b58ba1242c2f661d1a1defd9468a329b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:21:29 +00:00
Becca Hughes
f2c28935d7 Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: f1ad544cbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: Ia6aabed12273aec67957d11690f30d6e74996ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:10:02 +00:00
Becca Hughes
23daa094d9 DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: a620612b9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I402da5bd400745b2388f2622b339f30e37e4d4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:08:51 +00:00
Treehugger Robot
0469be62f0 Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687 am: a6f0662924
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I63b80b09c29c9d41f7b950c7a63955088e17824e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 18:02:40 +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
b19c1499f6 [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 9a1743f99d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife1c60681b1d98db8620b6b51081d950a14b5b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:59:08 +00:00
Becca Hughes
89a7c5737a [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 2083d07121 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23f386f3570e679fdfecc48144f0783e35d8c67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:57:35 +00:00
Becca Hughes
19b3c28e29 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 4c481b04c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d7e2df7f9689d5bb2ba8a4caaf9b5bab6b92ed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:56:50 +00:00
Becca Hughes
03c9849f70 [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 76e5f7fac4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10ddee3cfc402e483cfedafca2e6fb7b1cdc7352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 17:55:48 +00:00