PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,488 Commits 1 Branch 0 Tags
15cad1e7120fe5898fd6b91e47b9a1acd4e1100c
Commit Graph

71488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
4c988d91da Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I57629a7896e8f1651511367ca48befe481c4fda1
 2020-08-06 22:48:20 -07: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
The Android Open Source Project
1f9135acc9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I40df6a5d07d26214d0b57dc1c68b18b9858342af
 2020-08-06 21:19:19 -07:00
Bonian Chen
c78b12f3f4 Merge "[Settings] Remove Phone hidden constants access" 2020-08-07 04:12:03 +00:00
Bonian Chen
2410478bee Merge "[Settings] Code refactor" 2020-08-07 04:11:29 +00:00
The Android Open Source Project
e0aa6cf8cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ice617a49a4e8b1271deac5b4f8156421a2edd354
 2020-08-06 20:35:44 -07:00
The Android Open Source Project
be6b0a191a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: ff86e0d371 -s ours am: e9c4836070 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d42455c696136710cbcff2a982355393d0e97d8
 2020-08-07 03:26:47 +00:00
Automerger Merge Worker
3ce4553eb1 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: d4cd30eaa6 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 03:26:44 +00:00
The Android Open Source Project
3072f8c916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: d4cd30eaa6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14a651f4f5b580fe57defab5e85802c5fb571397
 2020-08-07 03:26:40 +00:00
The Android Open Source Project
bc7dea7c5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: 1905f56993 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04f5c84b5c1f368955117ad3cd3716d185beab3d
 2020-08-07 03:26:36 +00:00
The Android Open Source Project
e9c4836070 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: ff86e0d371 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5ae9a3a7ce4b0ec684c6bfc9a35ab00536fd78d
 2020-08-07 03:07:06 +00:00
The Android Open Source Project
1905f56993 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03bf43bdeafdcea7402eaf92c12ae8634867a6c7
 2020-08-07 03:06:52 +00:00
The Android Open Source Project
d4cd30eaa6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d67daf2072f8ba45fe2a29dd3c3c7a7909cdf2d
 2020-08-07 03:06:46 +00:00
The Android Open Source Project
ff86e0d371 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b19ecf8d43f7c9c20db6a995bb7def64688f5a8
 2020-08-07 02:50:57 +00:00
The Android Open Source Project
b4752ee39f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98d9f4f2f16671fa0ca8d6c7c237a76f5ba56206
 2020-08-07 02:50:55 +00:00
The Android Open Source Project
c13c712b58 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3bb874713476b81f55c01ce7e216a9c45cd5a4c4
 2020-08-06 19:08:08 -07:00
The Android Open Source Project
24cabff9dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77ea27e55c35b45123c1ee7cae67b09cc3e4218f
 2020-08-06 18:23:50 -07:00
Bonian Chen
3df18c4d1f [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours am: 5b01d70d8c -s ours am: cf10e35ea5 -s ours 
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: Id389b1e3c4d968b10bf903617f337cc8286234a0
 2020-08-06 16:55:07 +00:00
Bonian Chen
52e2324b61 [automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c am: 28e5351779 -s ours am: b0e6b28c4b -s ours am: b770db49d9 -s ours 
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585 is in history

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

Change-Id: Ib9a383b64c4f02ab103aa246f655fc9f7499319f
 2020-08-06 16:54:51 +00:00
Bonian Chen
3e26a1e58d [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours am: cce627f7a7 -s ours am: 09071f7a2d -s ours 
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: Ib42ae53c6b7781be764cec229b2bee6b175a1f2a
 2020-08-06 16:54:44 +00:00
Bonian Chen
e501cd2a91 [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours am: 5b79ed5ffa -s ours am: 309cd83703 -s ours 
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

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

Change-Id: Iba75d964901531cb32ac386064be3a59af81ae7b
 2020-08-06 16:54:36 +00:00
Bonian Chen
fb8293a152 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -s ours 
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

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

Change-Id: I25ab1624f08db239b6d0783aa580722a649804db
 2020-08-06 16:54:14 +00:00
Bonian Chen
b77aaf8055 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours 
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

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

Change-Id: Iee0800365e6a9ca0ca27b0482baa5d8d220ca46c
 2020-08-06 16:53:03 +00:00
Bonian Chen
8f8468fd08 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours 
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

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

Change-Id: Iaef18fc04be9b7d94cb84655dca15d9479778f1d
 2020-08-06 16:51:16 +00:00
Xin Li
ff75eec671 Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I71a23041e53c6f666bcba7360f07917fdbcab96b
 2020-08-06 16:48:26 +00:00
Bonian Chen
cf10e35ea5 [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours am: 5b01d70d8c -s ours 
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: Ibc36bfff1566749ec274e2a7cf3d8bdca8e39d2a
 2020-08-06 16:36:31 +00:00