PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,797 Commits 1 Branch 0 Tags
41838c76ecbec4e5216f78cf71c93b99b51e1bc2
Commit Graph

100797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
41838c76ec Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev am: 822d099412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17066725

Change-Id: I592ee8336be5549464915c0d357e71f97ea1bc15
 2022-03-03 12:54:22 +00:00
Edgar Wang
95c0e790ef Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d am: 3dc5c139cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927

Change-Id: If73c56407e00388ec976f8898dae2c57d121591c
 2022-03-03 12:43:56 +00:00
SongFerng Wang
822d099412 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev 2022-03-03 12:36:20 +00:00
Edgar Wang
b8c9fa79dd Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927

Change-Id: I7233aaf17296847ac5a9b817120f2f90f92511e7
 2022-03-03 12:20:55 +00:00
Edgar Wang
3dc5c139cc Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927

Change-Id: I7388330cc386f34ea14bba40fe9b2770b456fc35
 2022-03-03 12:19:41 +00:00
Tom Hsu
2abc341ea9 [automerger skipped] Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 am: 0249c0aff4 -s ours 
am skip reason: Merged-In Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 with SHA-1 ea9e627c1c is already in history

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

Change-Id: I172856dc26dfd476be49acfa96519ccc1055a721
 2022-03-03 12:11:15 +00:00
Bill Yi
827d66d74c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours am: 44b4adcb04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33ce247d6b630b5d4419b2deb76f7355caa1e7a0
 2022-03-03 12:09:40 +00:00
Edgar Wang
f0a675f07d Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev 2022-03-03 11:56:54 +00:00
Tom Hsu
532ddbe4e1 [automerger skipped] Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 -s ours 
am skip reason: Merged-In Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 with SHA-1 cae20ce2f7 is already in history

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

Change-Id: I267b3e851d0bf14e5196cfca73b1baeb4682d84f
 2022-03-03 11:49:20 +00:00
tom hsu
3bae17e403 [automerger skipped] [Panlingual] Improve UI can not show on at first. am: ea9e627c1c -s ours 
am skip reason: Merged-In Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 with SHA-1 cae20ce2f7 is already in history

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

Change-Id: Ic30d16970c7bfce6750b9bd90c00ffcb5f086ff7
 2022-03-03 11:49:19 +00:00
Bill Yi
6bc8179be4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id593e10a9322b5d1e9670f50941014707191307c
 2022-03-03 11:48:05 +00:00
Tom Hsu
0249c0aff4 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049211

Change-Id: Ib503c69b72bb7a757bc74b5c8904a157d517abc3
 2022-03-03 11:47:24 +00:00
Bill Yi
44b4adcb04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d8f732beb6e20657f47c32a26919f430d1db8d7
 2022-03-03 11:46:43 +00:00
Tom Hsu
f966c34a41 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev 2022-03-03 11:36:08 +00:00
Bill Yi
18a9ad3101 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40ac285e6b052159ede32d3ff07f8f900d8ec406
 2022-03-03 11:27:15 +00:00
Bill Yi
702e26be61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f28b44ef8df97b7a8378a6406ea002ba6314aa6
 2022-03-03 10:51:36 +00:00
Bill Yi
8f3d7d5a77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie77cff6452d3575640d7a610febe563736e4dd22
 2022-03-03 10:31:28 +00:00
TreeHugger Robot
613a20b60b Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d am: 2ac592070e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I7e0985fc314757b8fd6038bbaeca703dec98d911
 2022-03-03 10:21:55 +00:00
Bill Yi
4737c96916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours am: 73f7e22809 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7389eeca0c9d899530d206767802029ba6d6a23
 2022-03-03 10:21:49 +00:00
Bill Yi
8c84908a44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours am: d529bb6864 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65db0a7196bf7917c5251a0e8b8514e728347319
 2022-03-03 10:21:39 +00:00
TreeHugger Robot
10960dc3ff Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 am: aa7bb23dd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: Ifdfb4dc97e336806152c715400bc81e060d7f1b5
 2022-03-03 10:21:32 +00:00
Bill Yi
294fc6d0be [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours am: 7e5988a9b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f7871c90a137cb0ecc1c61f9d2eb386862397f7
 2022-03-03 10:21:31 +00:00
TreeHugger Robot
7497fe7e00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours am: 1cda28b22c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a0a2db13b9ef1bee72497f58e5af9f79bff58cb
 2022-03-03 10:21:10 +00:00
Bill Yi
2946142cdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours am: 71ea2a5db3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98a8abdf6524a737810f74c89f8d15eb091e141c
 2022-03-03 10:21:09 +00:00
TreeHugger Robot
61f9634f6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours am: 7202ce3d9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5458d58f754fc411828d705079a7f25aefa68ab7
 2022-03-03 10:20:10 +00:00
Bill Yi
2f1613b0f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours am: 722677a2c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0b0b138c13831a11a610efe49af60e3afd857e2
 2022-03-03 10:19:53 +00:00
TreeHugger Robot
2ac592070e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I9d3c8b4a0f6a31a603e16e440d77974b538b7db3
 2022-03-03 10:18:56 +00:00
TreeHugger Robot
77a42482c0 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I9a6f61a28aff2c55a25d027ddd0759503a432d89
 2022-03-03 10:18:37 +00:00
TreeHugger Robot
5a5bfcf48d Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I02091b9fa75c14c15da42fd83e1aeb10391b92d6
 2022-03-03 10:08:36 +00:00
Bill Yi
40e23845e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife884fc14969c0babdd6948edff1781a75e6cfb6
 2022-03-03 10:08:18 +00:00
Bill Yi
2c86c667ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2db011eaf588a7cc2533661f1e7df8c28ee612d
 2022-03-03 10:00:06 +00:00
Bill Yi
4be4b68367 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74b6cf10bd4173efe24c13b2366c9761c63a3cdf
 2022-03-03 09:59:39 +00:00
Bill Yi
73f7e22809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f9d6abecd5421bd8feac731cdc43b48025f328d
 2022-03-03 09:59:36 +00:00
TreeHugger Robot
99ff1245f4 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I5338ac84d2571c2c6698a5f7eb0e2485d56e1320
 2022-03-03 09:59:03 +00:00
Bill Yi
a0fe77c01f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd698d65cdcb3e812f51fcfbc602144c85f5e1e
 2022-03-03 09:59:02 +00:00
Bill Yi
d529bb6864 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ed395fb5c77ab3d5fc130e2c6dfb9d68639ca17
 2022-03-03 09:58:57 +00:00
TreeHugger Robot
aa7bb23dd7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I332e83fafd33d8be9f8b564275635b43f9c1103b
 2022-03-03 09:58:19 +00:00
Bill Yi
7e5988a9b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7717bb6d4c020f1961dfd62be5090db8df2568b
 2022-03-03 09:58:18 +00:00
TreeHugger Robot
a06d4dd336 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd656b616ff9ace155d40bdadf854d91a1cd0a0f
 2022-03-03 09:58:06 +00:00
TreeHugger Robot
1cda28b22c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f370fcb8b39cec5fcb45fba89eb47a9dc5a2573
 2022-03-03 09:58:05 +00:00
Bill Yi
2452ddb5a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idae44670190916b4b8df9e39f3f4fbbec0b08620
 2022-03-03 09:58:04 +00:00
Bill Yi
71ea2a5db3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bb2b62408df5cd9ef900d688a0eeee98334d0a2
 2022-03-03 09:58:03 +00:00
TreeHugger Robot
7202ce3d9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a0b99ba69dc098105754b02d63a4ab0952ea68e
 2022-03-03 09:57:16 +00:00
TreeHugger Robot
00008e601a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfb5bbab80cc06b0c76d7e1f092e5dfaf545b7da
 2022-03-03 09:57:14 +00:00
Bill Yi
722677a2c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68de70d7b107222aa4d5778ff391202206568ef7
 2022-03-03 09:57:11 +00:00
Bill Yi
5243b3ef11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I107b306c67c96cefe7b64a6ae7201776f34c5588
 2022-03-03 09:56:56 +00:00
Bill Yi
baecf5a51e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1138abe17216c8a1528e39a7e062a8fbc64fe794
 2022-03-03 09:56:29 +00:00
Bill Yi
01f5ecdb4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd3b6d272a62082e2cd40e715cb20704f1ba625
 2022-03-03 09:55:56 +00:00
SongFerngWang
e90d80cc52 [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId 
1. The subscriptionInfo's getSimSlotIndex is logical slotId. The code
   should compare it with uiccSlotMapping.getLogicalSlotIndex()
2. Rename the parameters for the readability.
3. The mobile network selection dialog did not be closed after user clicked.

Bug: 219951253
Test: manual test.
Change-Id: I7fef78547f4e6283791cd15a03275eaefeb50e3c
(cherry picked from commit 181f8179f1)
 2022-03-03 09:31:47 +00:00
TreeHugger Robot
57ff9d215e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:26:19 +00:00