PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,874 Commits 1 Branch 0 Tags
aa438742edc15c15d7bdcfbf918c34163fa0b76c
Commit Graph

122874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a48d96e698 Merge changes from topic "am-611eed0754b144ed92d14b3e518d54f2" into udc-d1-dev-plus-aosp 
* changes:
  [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: 283bea4dd0 -s ours
  [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours am: 27c242f01d -s ours am: 92c94ed6e9 -s ours
 2023-04-28 04:13:37 +00:00
Zaiyue Xue
68296e698a [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: 283bea4dd0 -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: I919996984aa47723ccbf9ee47bd116925274fe5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:12:00 +00:00
Tom Hsu
93edf2edd1 Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 574483e474 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I724fd9f9f18c65c67a354e703e59a7d0dd602a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:10:24 +00:00
Zaiyue Xue
75b3fc3f8c [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 am: c6d11de87e -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: Id8d7d85db67c593b7ebf7c6c617b0a8123633133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:09:44 +00:00
Zaiyue Xue
bd130156a3 [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours am: 27c242f01d -s ours am: 92c94ed6e9 -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: I20395f5108482bbc7b06f13dc5a3e9be13a7e44c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:09:36 +00:00
Tom Hsu
1e2ecf3e2e Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 39b150171b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: Id2f4e945fc893315f15f4f58e0f114187b5edb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:06:24 +00:00
Bill Yi
faf6409455 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 547484f797 
Blank merge reason: commit message contains skip directive

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

Bug: 278022447
Change-Id: I865cc944ab660f47b40b48af32a7aef389551963
 2023-04-28 03:55:42 +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
89323d4bc9 [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: If994cd71458c874a2a2041c201960b1b8cd2d8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:43:49 +00:00
Zaiyue Xue
72f7b61a84 [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: I3a39b7fcfbfce0c7b909e16a1275842bcafa5b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:43:03 +00: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
Zaiyue Xue
c6d11de87e Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22635696

Change-Id: I4cb41677f4c7bd55cd92440e6a0e59a8d3a878eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:18:27 +00:00
Tom Hsu
574483e474 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: I3e1823e82cc1d0a2cdc57652b8de7cbddd3bb2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:17:19 +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
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
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
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
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
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