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
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
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
Treehugger Robot
e207694022
Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b
am: 83f2d27e35
am: 97c42d8736
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510
Change-Id: I67a97e84918d365cb12cddb725ac69c93fa7dc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:47:09 +00:00
Becca Hughes
5bf3f571d9
Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659
am: 859df31fab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: Ia5471ab7f0f6a07252d46fbd950cf6a785a8bb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:46:46 +00:00
Becca Hughes
b74ca63c04
DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d
am: 3107fb0f96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: I7a3458867b4e859011d0bf7c7eec59b653f240e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:46:42 +00:00
Becca Hughes
55ceb266a0
Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3
am: 6df62b695c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836
Change-Id: I6b423b11fb9a94f0b15c3656c12c58d6281068e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:43:09 +00:00
Becca Hughes
0c3e99a61d
DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09
am: 7378d6c66c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836
Change-Id: Ie6b7ad67b7c41b8498bb786cb2231ff08ffc1126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:42:36 +00: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
8912f693f7
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: I74552f7341035452c3baacbb9debc3349051b72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:09:35 +00:00
Becca Hughes
c6a74847e4
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: I79a8f47acb16ac995333c7c40a0309c83e67404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:09:06 +00:00
Becca Hughes
f1ad544cbe
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: I5dd7579e3fb61a1d3e51801dc98ef249f2d1835b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:07:28 +00:00
Becca Hughes
a620612b9f
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: I0e113f37760847067042e41dd1a3e48d398c0270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:06:41 +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
Bill Yi
7f61419889
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140
Change-Id: I9d05f0a0f100e1bf8bbe240118d52a3b9080d4c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:54 +00:00
Bill Yi
e62b917856
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c
-s ours am: 9abc703e40
-s ours am: 49103dfc2e
-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: Ie36e50990b19eaaff5c7f9d0e53d23e3e60d9454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:41 +00:00
Bill Yi
f9ffefd7d6
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: Ie0a3acb47faeb2cc0b7029d37d43839046648ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:38 +00:00
Bill Yi
d0e1438572
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df
-s ours am: d4ba4def6a
-s ours am: 0ebc9d790d
-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: Id286a20a0b0cde92120577a575c306cc018618b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:34 +00:00
Bill Yi
58119147f3
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Ieecc5e87d441256e3af44bbb202a9d116acda300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:27 +00:00
Bill Yi
cb6e618de8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a
-s ours am: 22ac363063
-s ours am: 340b85bb5b
-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: I78a336675daab779f66653a3ec350073a2d6065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:48:17 +00:00
Treehugger Robot
304324ddd0
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I95c2b229ea2e32882a999b6e9e16b5d68f3bece8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:46:12 +00:00
Treehugger Robot
c4241ce611
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9
am: 0b8d81c18c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I2b3ca860ca03f35c5ef2e3c1bbd3b77cbfb04724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:45:53 +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
1ab96c0b22
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: I26bb2b04a543a22c619387ec41ae26e37f63aa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:08:45 +00:00
Bill Yi
9b25911c3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040
-s ours am: 9bb60a200e
-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: If5480716680eb2a785cff991e320999dd0671e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:51 +00:00
Bill Yi
49103dfc2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c
-s ours am: 9abc703e40
-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: I370319fcbc37e1a632a2e8a6d20083ece4b69566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:43 +00:00
Bill Yi
155b5266fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000
-s ours am: 4caa1ee4c3
-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: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df
-s ours am: d4ba4def6a
-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: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c
-s ours am: dcd5353e67
-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: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:19 +00:00
Bill Yi
340b85bb5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a
-s ours am: 22ac363063
-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: Idb3db0d1797033ce2854741532be1f0eb32823fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:06:56 +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
Treehugger Robot
46bd7feab6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 0cb641a695
-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: I1943d52ba4d0aa955897e823a3860ef619d98915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:05:02 +00:00
Treehugger Robot
0b8d81c18c
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I6372af8e100d0ab6d7709cc180c13efce4ff40fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:04:44 +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
TreeHugger Robot
fc81c4f554
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
am: ffb6adb9e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I8805a3a28cc710330861e409e3fc3e1435444973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:17:13 +00:00