PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,506 Commits 1 Branch 0 Tags
e95e7cd6ae20e3a911f4e62f7705d5cd9bc2913c
Commit Graph

105506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
4642c65d0a [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours am: 403c3de881 -s ours 
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I5c7844643c9410751d52a366d2f2aa9c43439035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:15:31 +00:00
Xin Li
a073091919 [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours am: 8d42cc939b -s ours 
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I1316d5e48662fdcec04c12a98ea2b49ffe090cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:14 +00:00
Xin Li
403c3de881 [automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f -s ours 
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: Ifaac4991da6fbde392ae1e40361c2f7255a6537c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:58:25 +00:00
Xin Li
8d42cc939b [automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3 -s ours 
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523 is already in history

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

Change-Id: I53467fc718067f75c246713000941af0d2b8e935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:57:07 +00:00
Salud Lemus
a1df448703 Fix title used for financed device info in Settings 
The title for the financed device info page in Settings changes to
"Managed device info" instead of "Financed device info"

Bug: 236259020
Test: Manual test

Change-Id: Ica6d990e8dada28b643a5523ec284c18d4af89d2
 2022-06-16 19:32:14 +00:00
Xin Li
a258d7760f Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Joshua McCloskey
27c5a5b804 Added face unicorn strings am: 66211d15bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18916254

Change-Id: I8a25346d1d9416a6c6099d1811ad04914793c231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 03:01:38 +00:00
SongFerngWang
5a4df243f0 Fix the NullPointException 
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.

Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
 2022-06-16 10:46:07 +08:00
Joshua McCloskey
66211d15bf Added face unicorn strings 
Test: Manual.
Fixes: 234663447
Change-Id: I57f0b52f645655647db38c58da2c158e63221c18
 2022-06-15 21:07:16 +00:00
Treehugger Robot
5b27a4e24c Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa am: bef728d2ff am: 3682ed9fca 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300

Change-Id: I5a857be001a9ef641299b3f849c141b45d5b6664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 18:20:58 +00:00
Treehugger Robot
3682ed9fca Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa am: bef728d2ff 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300

Change-Id: Iff5656052d729efb83a1947ecfd2393e87c9460a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:54:52 +00:00
Treehugger Robot
bef728d2ff Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300

Change-Id: Icf6b8698aa4f01e89076fc0566f5d71ef35c1742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 17:35:36 +00:00
Treehugger Robot
79e1afbdfa Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" 2022-06-15 17:12:06 +00:00
TreeHugger Robot
844417c14a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf72c73b773c475a21d43029ccf0c4c0774aff8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:35 +00:00
Bill Yi
c4e65cf197 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56973c016a00acb084a6bfbc02ea89bdbc58ae3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 16:47:12 +00:00
TreeHugger Robot
dc3e340774 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:17 +00:00
Jason Parks
9afd03c09e Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I41aea305788fc9063b50676b5594bfdd8f8873ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:42:13 +00:00
Jason Parks
296fe0d0cd Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: a48c508afa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I9bffe0d61056d7575015f5b20ff4b71da9714f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:42:03 +00:00
Jason Parks
3b6fe0813b Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:14:53 +00:00
Jason Parks
a48c508afa Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:13:24 +00:00
Jason Parks
73276b3c91 Merge "Use API to check for the superivion component." into tm-dev 2022-06-15 12:54:00 +00:00
Bruno Kremp
b16ac39ee1 Keep setting of "TurnOff hotspot automatically" when AP is changed 
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.

Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com>

Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
 2022-06-15 09:20:18 +02:00
TreeHugger Robot
cb303ebddb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: d61b92219c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08978da87652acc89b46407184d3953c56cb4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:40:04 +00:00
Bill Yi
b96acd4fac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 46611a953c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57af273bd94d9d2b70d352bcb9755b1d1bcc86f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:39:45 +00:00
TreeHugger Robot
a1a8b5e856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64150ce37ea4f962599a36f3934939905c44f2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:31 +00:00
Bill Yi
a7456fac34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8d0011e7ee64d4511fa8998a3bd2181783ded91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:22 +00:00
TreeHugger Robot
d61b92219c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23832d4722bd717e48189823e8557ba268ec797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:59 +00:00
Bill Yi
46611a953c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5d75ff189ee4beac391c7978d4a313868e9aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:42 +00:00
TreeHugger Robot
5e4e0ee275 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4e1f5d253455ff3aea0a1b7878d2d79f43b1b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:33 +00:00
Bill Yi
588d339d4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f573d48d312206e50d030707f37a2a3953e9332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:20 +00:00
Amy Hsu
16d022942f Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I399f7592e930545ba1d9e38a62d58aa58bda5b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:11:34 +00:00
Amy Hsu
be6fef3095 Merge "Restore the density when it has been overridden" into tm-d1-dev 2022-06-15 05:31:43 +00:00
TreeHugger Robot
50a74572fc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-15 05:25:34 +00:00
Bill Yi
2609fb2ccb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
 2022-06-14 21:21:00 -07:00
TreeHugger Robot
eb1d552ac2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b10e291ea2bf756c3cc9d25f5f222d34f2515de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:21:08 +00:00
Bill Yi
88d6e11c70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia45c913ef45c94283d56c7952668f26cbf27b721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:20:48 +00:00
TreeHugger Robot
838099408b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 01:08:49 +00:00
Xin Li
d6c80bd8e3 Merge Android 12 QPR 3 
Bug: 236045730
Merged-In: Ie1e14a6b697af624854a9360a60383fac63bb02c
Change-Id: Ib7885655035baa9aa6add39f7a169f7c84d48138
 2022-06-14 16:48:16 -07:00
Jason Parks
4a9c108b28 Use API to check for the superivion component. 
Bug: 219025233
Test: manual
Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1
 2022-06-14 17:16:07 +00:00
SongFerng Wang
3d14d61621 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 am: 95f153642c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I1418690d52c1e74f74f5d2bbf731ab5170e2c101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:37 +00:00
SongFerngWang
879118669a [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours am: a5ddd89091 -s ours 
am skip reason: Merged-In Ibd324b781c84318c994e3742bb82e1d1393b94e4 with SHA-1 64430ba2d2 is already in history

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

Change-Id: I0353cccd4e527e8492502d2662e1db403b1fdd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:36 +00:00
SongFerngWang
8710ee1034 [automerger skipped] Reuse the active esim slot am: 887bb592c8 am: da2d1d85aa -s ours am: e74c1c4204 -s ours 
am skip reason: Merged-In I6daa38f54abfaf67c7640d9dc8be0da02eb59554 with SHA-1 42aa247383 is already in history

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

Change-Id: Id41d905e83f0178ca62d6479afd38e9bf5c6adbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:35 +00:00
SongFerngWang
3af28e34a4 [automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b am: 886193184d -s ours am: 82fb3dc1f5 -s ours 
am skip reason: Merged-In I242402e49b267c8cd61a85a46367c778d2d8bbf8 with SHA-1 c389149ff3 is already in history

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

Change-Id: Ibcb2b5923e98ba54dd0b2770c74d94c9ef0a33b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:44:34 +00:00
SongFerng Wang
95f153642c Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I2ed62ef98c1e81d6549ba1eb0c271ef3bf61d168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:08 +00:00
SongFerngWang
a5ddd89091 [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours 
am skip reason: Merged-In Ibd324b781c84318c994e3742bb82e1d1393b94e4 with SHA-1 64430ba2d2 is already in history

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

Change-Id: I99165f11aac03bbca7ecc3af80fe669a90cb098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:07 +00:00
SongFerngWang
e74c1c4204 [automerger skipped] Reuse the active esim slot am: 887bb592c8 am: da2d1d85aa -s ours 
am skip reason: Merged-In I6daa38f54abfaf67c7640d9dc8be0da02eb59554 with SHA-1 42aa247383 is already in history

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

Change-Id: I853b143264b8b796018517858db1b121b050aec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:05 +00:00
SongFerngWang
82fb3dc1f5 [automerger skipped] stop show preferred SIM card dialog during sim switch am: faf9baf95b am: 886193184d -s ours 
am skip reason: Merged-In I242402e49b267c8cd61a85a46367c778d2d8bbf8 with SHA-1 c389149ff3 is already in history

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

Change-Id: I6540061086c8275648ee105db0664ecad8944931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 07:27:01 +00:00
SongFerng Wang
a5a729f523 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: Ie1e14a6b697af624854a9360a60383fac63bb02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:22 +00:00
SongFerngWang
fbfaa331d2 Unable to enable the removable esim am: 56e1297abe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195

Change-Id: I02f2599c790c90a0b602b84bc8b511f521a7e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:21 +00:00
SongFerngWang
da2d1d85aa Reuse the active esim slot am: 887bb592c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194

Change-Id: I273a609f8f615c9e74fbf416c859b5159ca420c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 06:59:20 +00:00