PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,341 Commits 1 Branch 0 Tags
a4d9b831494669b7949fe6cb7d83c31f2ab675d3
Commit Graph

102341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
a4d9b83149 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours am: d700cfe212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e93993b9c4031bc071da3ba83faa8fe1b965855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:19:26 +00:00
TreeHugger Robot
efed78d9fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours am: 1fd59e05d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id65e97c0a8085b93ce05cc97bbaa5f42d1650d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:19:07 +00:00
Lucas Silva
86d973a79c Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf am: f8c7a84eb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: Ie5e66a433141ff2273c9d6cbdf140d3424fe0d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:18:54 +00:00
TreeHugger Robot
b6e489cd56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours am: e9c60d9d72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67c36a32fd6af0572d278e978fd38233a821ae2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:18:21 +00:00
Bill Yi
e2a173d3a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours am: 942891fc3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5f5a927ede5b3a4dd806853f7526670db9d61be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:18:20 +00:00
TreeHugger Robot
b614bf28ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours am: 0ec6ee3588 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib71cad3874d96d31d0bf8aea04abf685e454996a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:13:45 +00:00
Bill Yi
f0890308c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours am: da6144dcbd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccf6e7b6d9995f5514c0c82db7d67b31052ca709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:13:43 +00:00
TreeHugger Robot
69929e2dcd Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e am: fe3d04de86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I2e24d1cbce2ac8bea5045f41156a534df5fd0c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:13:04 +00:00
Bill Yi
204786c737 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours am: 7044a2ee63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2dd09d9c797d630bf7953ef9eb89557012b9f4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:13:03 +00:00
Bill Yi
4801f9a9aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 89a0c5fb00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55225551206e9b9b72a15fd08fd09de6bfb4c06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:12:20 +00:00
Bill Yi
98baf75c26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fac9ad72b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I110823dbe4bfacea28daa5efef2674095146af55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:12:19 +00:00
Bill Yi
ee6033af75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 08549ed959 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88b70dc5e038e9b9c95bef55acf3653a93483156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:06:12 +00:00
Bill Yi
01ef39c8b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5491463fe6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7df2ca00922b5dbbd4cdddc4913215669053c457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 18:06:09 +00:00
Bill Yi
d700cfe212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours am: 4b073cf421 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8151cc6183dee4aca9e57a8884ef975c08f38f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:47:15 +00:00
TreeHugger Robot
1fd59e05d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours am: 0312b67407 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied28975e9ee048034465f7a680b2349d52133e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:46:03 +00:00
Lucas Silva
f8c7a84eb8 Merge "Add hyphenation to customize button text." into tm-dev am: b31dbbb1cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17758405

Change-Id: I087523825288400c738a188c04ac5d9bea53a3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:16 +00:00
TreeHugger Robot
e9c60d9d72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2212edb907 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I504a845295c3f73bf08f3f26e464c412789f36f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:45:00 +00:00
Bill Yi
942891fc3c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f2bfb3a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I427dcfa9066828733b05add13eaff191c9d0180b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:59 +00:00
TreeHugger Robot
0ec6ee3588 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2880f9c765 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic21ba199682d8fbdb941775739ac79a2b1b9c7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:08 +00:00
Bill Yi
da6144dcbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b31a221ace -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff358f9dff5601de01a21e17ccc59d050183d9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:44:07 +00:00
Bill Yi
4b073cf421 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f5b29384 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ddd79cb6636eba32d51861c90fd5f5bfcf1bacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:40:08 +00:00
TreeHugger Robot
fe3d04de86 Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev am: 55e91da24e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745184

Change-Id: I9cecbd87511cb97a05fff121fac736e26f140ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:59 +00:00
Bill Yi
7044a2ee63 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0 am: 5a7f4fcb00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0ae216d77188d560933313a35a1b02196a22737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:58 +00:00
TreeHugger Robot
0312b67407 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e3b581c350 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26e318e71a59517302ae0db449f649f586766093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 17:39:34 +00:00
Lucas Silva
b31dbbb1cf Merge "Add hyphenation to customize button text." into tm-dev 2022-04-14 17:39:13 +00:00
Bill Yi
89a0c5fb00 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-14 17:16:07 +00:00
Bill Yi
08549ed959 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-14 17:14:41 +00:00
TreeHugger Robot
2212edb907 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:10:29 +00:00
TreeHugger Robot
2880f9c765 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-14 17:08:33 +00:00
TreeHugger Robot
55e91da24e Merge changes from topic "presubmit-am-5e82c0fb6c2a413f9587cafc2046d978" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17b4bfa5b0
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-14 17:08:18 +00:00
TreeHugger Robot
e3b581c350 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-14 17:08:18 +00:00
TreeHugger Robot
2dd28aa043 Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a am: de1481d68a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804

Change-Id: I5f6e6b48b9fd8c7ae26a0d43e49b6931c78633a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:55:52 +00:00
Quang Luong
0f1e422f99 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 am: 0bbdf3a983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256

Change-Id: Ie30e4eccddb2ccd0c1cb22f4c235c83aa894980b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:53:45 +00:00
TreeHugger Robot
de1481d68a Merge "Add 2 pixels to top of Advanced Options component" into tm-dev am: 37c2ac2c6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17745804

Change-Id: I675e9e5e1100c91eb01639a020be65f0bdd47e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:34:59 +00:00
Quang Luong
0bbdf3a983 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256

Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 16:34:52 +00:00
TreeHugger Robot
37c2ac2c6a Merge "Add 2 pixels to top of Advanced Options component" into tm-dev 2022-04-14 16:28:11 +00:00
Quang Luong
93ae7acbf4 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev 2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
cf162bc514 Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: de992a99f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388

Change-Id: I5bb37aab6ba314bca3db22a574dbe38d671e4d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:26:00 +00:00
Bill Yi
6883e565c5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-14 15:13:58 +00:00
Bill Yi
5f31fac340 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-14 15:08:42 +00:00
Tsung-Mao Fang
de992a99f8 Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388

Change-Id: I89af98755aef258bfa9234bcdd490ca9a43c9e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 15:05:45 +00:00
YK Hung
b4dc55d47b Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 am: fe2e6b19d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849

Change-Id: Ic537bb4a1e610e2d8fa02b303f9f8056e013627b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 14:55:05 +00:00
Lucas Silva
1ccbf8b7d5 Add hyphenation to customize button text. 
In some languages, customize may be a long word which doesn't fit in a
single line and should be hyphenated.

Bug: 228329886
Test: locally on device
Change-Id: Ibf647fc4c18b3eb927f2b6f6ca018f2b38e6f7b1
 2022-04-14 14:48:14 +00:00
Tsung-Mao Fang
7877c073e5 Merge "Use androidx.window from prebuilt." into tm-dev 2022-04-14 14:40:21 +00:00
YK Hung
fe2e6b19d8 Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev am: 3a08246bd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17751849

Change-Id: If8eba2fe329e9b4d078d2b9d25bc345480d9a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 14:33:31 +00:00
YK Hung
3a08246bd9 Merge "Pass the activtiy launch flags into the AdvancedPowerUsageDetail" into tm-dev 2022-04-14 14:12:33 +00:00
ykhung
39972db17d Pass the activtiy launch flags into the AdvancedPowerUsageDetail 
Bug: 227978302
Test: manual
Change-Id: I036bc90eb91fd59137b51817665378f218bbad1a
 2022-04-14 19:57:14 +08:00
SongFerng Wang
1612f73d2d [automerger skipped] Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c am: 459429c182 am: 9d10f0a9fb -s ours am: 68defd99f1 -s ours am: 97b86392fb -s ours 
am skip reason: Merged-In I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85 with SHA-1 506c3df5b9 is already in history

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

Change-Id: I5f2279cf7b568fe832fa864b04df10853334fa8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 11:31:16 +00:00
SongFerngWang
d6b4e5277f [automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9 am: 6282d8a5de am: 10d36c9800 -s ours am: d1ae5c3d08 -s ours am: 11213d623e -s ours 
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73 is already in history

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

Change-Id: I0116edde251547b63666f1443c4f5b097736e9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 11:31:15 +00:00
SongFerngWang
f77becc321 [automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7bd am: 83311b6208 am: bca382eefb -s ours am: f137d36ea7 -s ours am: cc06f67db0 -s ours 
am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c827b is already in history

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

Change-Id: I4cb004824739e27307153e1007091c141057bea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-14 11:31:14 +00:00