PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,283 Commits 1 Branch 0 Tags
ae418fc5e81eab2eeda7bd5c07f5835e8aacb2cc
Commit Graph

70283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ae418fc5e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours am: 203bb3924e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3396b7edb5cf9599ca36236139f4737668025bc
 2020-08-07 15:10:53 +00:00
TreeHugger Robot
203bb3924e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1da29b3f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia45d69e65757280f755404f1209c12ac5b17ba59
 2020-08-07 15:01:27 +00:00
TreeHugger Robot
1da29b3f77 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-07 14:45:54 +00:00
TreeHugger Robot
48d768b00c Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev am: edd587c2a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12167384

Change-Id: I41175eb59b2cea6dfeb97d1413ab6c4846ddb844
 2020-08-07 11:49:39 +00:00
TreeHugger Robot
edd587c2a6 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" into rvc-qpr-dev 2020-08-07 11:37:27 +00:00
Bonian Chen
d29596e18a [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours am: 6343b81231 -s ours am: e6ba59fc7b -s ours 
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: I21d38488fb8258df484cbe3b1db177bd436d00cc
 2020-08-07 07:45:43 +00:00
Bonian Chen
d455229ab9 [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours am: e3cb875f3f -s ours 
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: If9768b2782276ae7fafca08a0e44175556101129
 2020-08-07 07:45:34 +00:00
Bonian Chen
e6ba59fc7b [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours am: 6343b81231 -s ours 
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: Ie22e3768e0b311d7b27e02740271e51ee951895b
 2020-08-07 07:37:09 +00:00
Bonian Chen
e3cb875f3f [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours am: f1dbf2bd5e -s ours 
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: I861eaf0ca9e26c3793169399f287cfc6351e312b
 2020-08-07 07:37:01 +00:00
Bonian Chen
6343b81231 [automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef00 am: 7f567d422b -s ours 
am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f7667 is in history

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

Change-Id: I242f384a9374e8d0b8c7a4121839140ab1d174fc
 2020-08-07 07:26:44 +00:00
Bonian Chen
aecd813846 [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours am: c753471a4d -s ours am: f9aea105d9 -s ours 
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: If8d71349cd40c8c8f0490a8ea0c2bda429ea1304
 2020-08-07 07:26:32 +00:00
Bonian Chen
f1dbf2bd5e [automerger skipped] Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f am: 4d01040160 -s ours 
am skip reason: Change-Id If4b53bbbc6b51582bc0837abf4497d9a75ebbaad with SHA-1 9c69ded434 is in history

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

Change-Id: Ie88640e9331b88eb45be68242ee9cdbfb5d752a7
 2020-08-07 07:26:31 +00:00
Bonian Chen
7f567d422b Merge "Remove the second network scan." am: 99a7c3ef00 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393365

Change-Id: I84fd87b8ce8f116ba291159c2cf8e39198d05c2b
 2020-08-07 07:16:37 +00:00
Bonian Chen
4d01040160 Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 37a0c3873f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393239

Change-Id: I5b928212912c02f46f2e1d1edcd95cb8b45c5499
 2020-08-07 07:16:25 +00:00
Bonian Chen
f9aea105d9 [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours am: c753471a4d -s ours 
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: Idbc41dca5d8479be2ef7d4573c4ffd756eb1162b
 2020-08-07 07:16:20 +00:00
Bonian Chen
99a7c3ef00 Merge "Remove the second network scan." 2020-08-07 07:06:31 +00:00
Bonian Chen
37a0c3873f Merge "The text on toast should be changed when remains 1 time for SIM lock input" 2020-08-07 07:04:36 +00:00
Bonian Chen
c753471a4d [automerger skipped] Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 am: 9a5a1eabb6 -s ours 
am skip reason: Change-Id I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e with SHA-1 ff11f200c8 is in history

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

Change-Id: I90e103ef95b51c2f8736fa95b81d0259e8d7f51a
 2020-08-07 07:04:08 +00:00
Bonian Chen
9a5a1eabb6 Merge "Add NR Global to the logic to check if it is Global" am: 64c40305b4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393367

Change-Id: I079dd54dd80f39853861f7a27ec9ac24404cc494
 2020-08-07 06:54:41 +00:00
Bonian Chen
64c40305b4 Merge "Add NR Global to the logic to check if it is Global" 2020-08-07 06:42:10 +00:00
Automerger Merge Worker
2ca8a4d3bb Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: ad4bd4cb82 -s ours" into rvc-d1-dev-plus-aosp am: b9d1376ec0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I500efcff95216f165fa89b5a868da335eaaa7543
 2020-08-07 06:39:11 +00:00
Automerger Merge Worker
a7a753e5ed Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: 27f7aae886 -s ours am: 62da4cd15c -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 06:38:59 +00:00
TreeHugger Robot
f0c2f5bfe6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: 27f7aae886 -s ours am: 62da4cd15c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7562c799b4a582c2303972d5c000fa3dbc3efa50
 2020-08-07 06:38:54 +00:00
TreeHugger Robot
39ba1e0c8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: 27f7aae886 -s ours am: 33b59d400c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a3b8551756ac0a495c3bc85ffd29d48fa78ca4b
 2020-08-07 06:38:47 +00:00
Automerger Merge Worker
b9d1376ec0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: ad4bd4cb82 -s ours" into rvc-d1-dev-plus-aosp 2020-08-07 06:30:00 +00:00
TreeHugger Robot
62da4cd15c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: 27f7aae886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ea0f2e14c9260da002a38008011b0b5caf45aac
 2020-08-07 06:29:58 +00:00
TreeHugger Robot
6346c7bb6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: ad4bd4cb82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0db72980918e2023eec9f0518b7892faecd7e971
 2020-08-07 06:29:56 +00:00
TreeHugger Robot
33b59d400c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours am: 27f7aae886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb1c4448cf88e7cbec93af2ec14265d8ad26b49f
 2020-08-07 06:29:50 +00:00
Tsung-Mao Fang
d042a9f2d3 The text on toast should be changed when remains 1 time for SIM lock input 
The behavior of getQuantityString() is different according to language, it gets both "other" and "one" string if English is system language. But it always gets "other" string if non-English, then the "other" string of wrong_pin_code is shown even if remains 1 time of SIM lock input.

In order to change the string in any language, we add new string for remains 1 time.

Test: Rebuild rom
Fix: 71783850
Merged-In: If4b53bbbc6b51582bc0837abf4497d9a75ebbaad
Change-Id: I1c069333b19399b727e10ed4a6c9483cc1bc44a6
 2020-08-07 06:19:07 +00:00
TreeHugger Robot
ad4bd4cb82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bc4c3c0c35498d042201c276bbf9284141bf94c
 2020-08-07 06:17:01 +00:00
TreeHugger Robot
27f7aae886 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4492d29ee205814cdd4662b1b0fbdcf76be3a5d5
 2020-08-07 06:16:57 +00:00
TreeHugger Robot
cc635deec0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours am: a05e3900c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04b0535dedf9a80707deef6c55b27951aae4f804
 2020-08-07 06:16:54 +00:00
TreeHugger Robot
37a3d091ba Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-08-07 06:02:58 +00:00
TreeHugger Robot
1c16c55c42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours am: 0be7b479b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30453808a30d08808adb16cfd968021dd98c9923
 2020-08-07 06:02:37 +00:00
TreeHugger Robot
ef85937fb6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 22b9581984 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11a390cd9dcf67419c9f3bb7ec48ac3ae13b349a
 2020-08-07 06:02:31 +00:00
TreeHugger Robot
0be7b479b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e9e3d96b56cbe9d472fbad3f5458b852ab63766
 2020-08-07 06:02:23 +00:00
TreeHugger Robot
a05e3900c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23864996422d46a728f659d303583966159ff9ff
 2020-08-07 06:02:14 +00:00
TreeHugger Robot
22b9581984 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-07 05:48:37 +00:00
TreeHugger Robot
bdd997c335 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-07 05:47:49 +00:00
calvinpan
20d2826381 Add NR Global to the logic to check if it is Global 
Bug: 151285260
Test: Build pass
Merged-In: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
Change-Id: I5b0414302c9214116de30212a03a36972af29ca1
 2020-08-07 13:11:02 +08:00
Bonian Chen
f77ace88c6 [automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 am: 5bf89f4f5a -s ours am: 85ace93774 -s ours am: 911a4f6734 -s ours 
am skip reason: Change-Id I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 with SHA-1 4ecff2c833 is in history

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

Change-Id: I6f99ea37ea2ace954bafc6c2066560c4680c4843
 2020-08-07 05:08:31 +00:00
Bonian Chen
c7807d7c3f [automerger skipped] Merge "[Settings] Code refactor" am: 2410478bee am: 43a78331d5 -s ours am: deb24b6aec -s ours am: 2d98b88ddb -s ours 
am skip reason: Change-Id I060e7c880d91a0e5059610c5ceae319d47c19c7a with SHA-1 9bc2f7f8bc is in history

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

Change-Id: I18f8a7789dd4b0ab374d72d0fed3b1869d9bcf94
 2020-08-07 05:08:13 +00:00
The Android Open Source Project
7b9abf9276 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I22bd7dce0d754b758b56468f0934989e319105a1
 2020-08-06 22:03:50 -07:00
SongFerngWang
9bcf7861bd Remove the second network scan. 
Fix: 153427564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkSelectSettingsTest
(PASS)

Merged-In: If593fc4a4dd463bbc178b4864ad0ba01bb421b09
Change-Id: I34b898514351aa6c00934ce638e3a59a5aa8f077
 2020-08-07 13:02:45 +08:00
Bonian Chen
911a4f6734 [automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 am: 5bf89f4f5a -s ours am: 85ace93774 -s ours 
am skip reason: Change-Id I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 with SHA-1 4ecff2c833 is in history

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

Change-Id: I2152fd099e308d8e13cbe861f86db5afdcb288ce
 2020-08-07 04:56:47 +00:00
Bonian Chen
2d98b88ddb [automerger skipped] Merge "[Settings] Code refactor" am: 2410478bee am: 43a78331d5 -s ours am: deb24b6aec -s ours 
am skip reason: Change-Id I060e7c880d91a0e5059610c5ceae319d47c19c7a with SHA-1 9bc2f7f8bc is in history

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

Change-Id: I3c53dee5fa9cb76d398e6d37e6785a7fb299a320
 2020-08-07 04:56:32 +00:00
Bonian Chen
85ace93774 [automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 am: 5bf89f4f5a -s ours 
am skip reason: Change-Id I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 with SHA-1 4ecff2c833 is in history

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

Change-Id: I9255cfd3c8941b049c752b1dc4d4a1dfa1c84879
 2020-08-07 04:41:20 +00:00
Bonian Chen
deb24b6aec [automerger skipped] Merge "[Settings] Code refactor" am: 2410478bee am: 43a78331d5 -s ours 
am skip reason: Change-Id I060e7c880d91a0e5059610c5ceae319d47c19c7a with SHA-1 9bc2f7f8bc is in history

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

Change-Id: I605e256d129e4ed4f324624772505bbd1d00fc3f
 2020-08-07 04:41:11 +00:00
Bonian Chen
5bf89f4f5a Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393243

Change-Id: I4103dbdd33177ecd4e91687abd6a0fc271313155
 2020-08-07 04:26:36 +00:00
Bonian Chen
43a78331d5 Merge "[Settings] Code refactor" am: 2410478bee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393240

Change-Id: I6251d8ae967e6a29d5d85f6dfe62cd6316925ca2
 2020-08-07 04:26:19 +00:00