Commit Graph

75365 Commits

Author SHA1 Message Date
Bill Yi
e9c5e16bb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 00216c3bc8 -s ours am: 85335be7a4 -s ours am: 3864fa5bd2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c29aa91850a0a583861146a8b0d1de1f8afab2d
2020-08-05 08:00:08 +00:00
Bill Yi
df305dea89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 24989cd5e8 -s ours am: 1f73b95a2a -s ours am: 7e212754a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70a5c54605bbb7eed518f887355475542f94c439
2020-08-05 07:59:59 +00:00
Bonian Chen
41fa869dfb [automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6 am: 05b07f424e -s ours am: 0aa15f333e -s ours am: 86eb9931e0 -s ours am: 124e5da825 -s ours am: 8b258b7603 -s ours
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3 is in history

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

Change-Id: I08badfffb3be0174566fbc4a8285942e4559c563
2020-08-05 07:59:50 +00:00
Bonian Chen
a0aea76d40 [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours am: 522841a340 -s ours am: 841239c310 -s ours am: c6f6da1353 -s ours am: ae06d6400f -s ours
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: If74141da0719eacd92869149d783c284e7b4a09c
2020-08-05 07:59:39 +00:00
Bill Yi
3864fa5bd2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 00216c3bc8 -s ours am: 85335be7a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb1b2dbaf3678815b2a67b165ae066f8c4a39505
2020-08-05 07:36:59 +00:00
Bill Yi
7e212754a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 24989cd5e8 -s ours am: 1f73b95a2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e7fbacc7ed6701950fff3aff05a0dec60d4620c
2020-08-05 07:36:49 +00:00
Bonian Chen
8b258b7603 [automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6 am: 05b07f424e -s ours am: 0aa15f333e -s ours am: 86eb9931e0 -s ours am: 124e5da825 -s ours
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3 is in history

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

Change-Id: Ia7c60b825b9ce6fb32c62eef9564678d9b2cabb4
2020-08-05 07:36:33 +00:00
Bonian Chen
ae06d6400f [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours am: 522841a340 -s ours am: 841239c310 -s ours am: c6f6da1353 -s ours
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: Iac25b7e4206f364581326f3a1526f5958518e78d
2020-08-05 07:35:41 +00:00
Bill Yi
85335be7a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 00216c3bc8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I271da78e5f0b768a4b1ce27caadae5f0aaa5b2a7
2020-08-05 07:20:20 +00:00
Bill Yi
1f73b95a2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours am: 24989cd5e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0b30e76b677934004d21e96879fb18381614649
2020-08-05 07:12:03 +00:00
Bonian Chen
124e5da825 [automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6 am: 05b07f424e -s ours am: 0aa15f333e -s ours am: 86eb9931e0 -s ours
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3 is in history

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

Change-Id: Ia334a6fc0d1dfc35aad01b44afd3d415e0eb9d83
2020-08-05 07:11:52 +00:00
Bonian Chen
c6f6da1353 [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours am: 522841a340 -s ours am: 841239c310 -s ours
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: I381bc1b4bbab6cfb47f97c2e900ecf824ea0f8d4
2020-08-05 07:11:36 +00:00
Bill Yi
00216c3bc8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I665b7a80515675b90ed66d0c59ecfdf12c45b59e
2020-08-05 07:01:51 +00:00
TreeHugger Robot
9ed1c28ccb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7387c7882f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I60335d309a650ae25a57178ead83285188f98358
2020-08-05 07:00:44 +00:00
Bill Yi
24989cd5e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d88c92bb3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5fbcf85109abeac3de8affec571bb4dac588b76
2020-08-05 07:00:32 +00:00
Bonian Chen
86eb9931e0 [automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6 am: 05b07f424e -s ours am: 0aa15f333e -s ours
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3 is in history

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

Change-Id: Icec33748f3533de0dfba804d76a6a9054d694af7
2020-08-05 06:55:02 +00:00
Bonian Chen
841239c310 [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours am: 522841a340 -s ours
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: I41d01700808443fe90d2084be38aa32deded760d
2020-08-05 06:54:27 +00:00
TreeHugger Robot
7387c7882f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-05 06:43:53 +00:00
Bonian Chen
0aa15f333e [automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6 am: 05b07f424e -s ours
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3 is in history

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

Change-Id: I5bc786d8faf457d85ce90e1226a4c34a2f2752c8
2020-08-05 06:40:58 +00:00
Bonian Chen
abd475df36 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours am: 8c81b0f412 -s ours am: 84c6336cff -s ours am: f534811627 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: I350f61c610d4f7199d67a3a9659f4563826aeb97
2020-08-05 06:39:48 +00:00
Bonian Chen
522841a340 [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: I6a0cc537207cdb772ec26f347b570c14ebc9a5f4
2020-08-05 06:36:19 +00:00
Bonian Chen
05b07f424e Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387127

Change-Id: I9e2af4dda890ab5b13aa049430161eab1d602df3
2020-08-05 06:11:11 +00:00
Bonian Chen
1e328285b7 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126

Change-Id: I9389e2226554123fd25844c27aa24e6b13466124
2020-08-05 06:11:00 +00:00
Bonian Chen
f534811627 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours am: 8c81b0f412 -s ours am: 84c6336cff -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: Ic49870f5f08be705c23bf5df88a8c1ef9e8e8a38
2020-08-05 06:09:09 +00:00
Bonian Chen
622da45ee6 Merge "[Settings] Data roaming warning only when turn ON" 2020-08-05 05:58:13 +00:00
Bonian Chen
b3b25c39c9 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" 2020-08-05 05:55:32 +00:00
Bonian Chen
84c6336cff [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours am: 8c81b0f412 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: I0efa0bf0f9ecdbb870f3903145efeba3ce410c0a
2020-08-05 05:52:40 +00:00
Bonian Chen
8c81b0f412 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: If5b7a1461b5a8fef8526f91689f3938ff6d4e4ef
2020-08-05 05:36:40 +00:00
Bonian Chen
620f9c0b28 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: If56211f627d1898c14db2c7fc3ecb491ec1cdda9
2020-08-05 05:15:37 +00:00
Bonian Chen
f5557102c9 Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129

Change-Id: I84e8bf96b0d58f5833e00effaee52e120f77fa98
2020-08-05 04:57:19 +00:00
Bonian Chen
144e2b41f5 Merge "Remove logic to manually search inactive pSIM." 2020-08-05 04:39:45 +00:00
Bill Yi
c5bfd20042 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1d989aa630906a9aef4c31952fb90712a542602
2020-08-05 02:14:15 +00:00
Bill Yi
3d88c92bb3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I10b1f760c4f7e55be7feef9dfe6e1881fd07d85f
2020-08-05 01:00:16 +00:00
TreeHugger Robot
5f08726c1b Merge "Update language to comply with Android's inclusive language guidance" am: 6300e98b1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12295302

Change-Id: I5e68a3ce5fbcd91032d434df7e6a6d1c28ca39f7
2020-08-04 19:15:13 +00:00
TreeHugger Robot
6300e98b1f Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 18:52:54 +00:00
Kevin Chyn
b83fa7d68a Merge "Save mConfirmingCredentials state" am: 5224c86444
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12282476

Change-Id: Id367a896794969195fe4f4ef6dc7eccc396ae076
2020-08-04 17:52:44 +00:00
Kevin Chyn
5224c86444 Merge "Save mConfirmingCredentials state" 2020-08-04 17:37:32 +00:00
TreeHugger Robot
ffa5555f6e Merge "Update language to comply with Android's inclusive language guidance" am: 6daf67a792
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12292650

Change-Id: Ie71538b1228350f1afcfb765765f00251341d5cc
2020-08-04 15:56:24 +00:00
TreeHugger Robot
7ac46f2615 Merge "Update language to comply with Android's inclusive language guidance" am: 6a68e2f216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12295374

Change-Id: If25fc0d7d7d415811abbd0e791efa3035ca2db28
2020-08-04 15:56:08 +00:00
TreeHugger Robot
6daf67a792 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 15:40:55 +00:00
TreeHugger Robot
6a68e2f216 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 15:39:56 +00:00
Julia Reynolds
4b4043975a Merge "Allow DND screens on low ram devices" into rvc-qpr-dev am: 74c6c21b96 am: 885da59d6a am: 8f1309a69d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12294001

Change-Id: I239d31b9bf737d38041010abeb3661bc18d41f68
2020-08-04 14:42:45 +00:00
Julia Reynolds
8f1309a69d Merge "Allow DND screens on low ram devices" into rvc-qpr-dev am: 74c6c21b96 am: 885da59d6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12294001

Change-Id: I8d05cc9b93c4dd75384f463988bfd915001ba94e
2020-08-04 14:18:32 +00:00
Julia Reynolds
885da59d6a Merge "Allow DND screens on low ram devices" into rvc-qpr-dev am: 74c6c21b96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12294001

Change-Id: I1e318a02298759aa95d71459508273d7985a2696
2020-08-04 13:52:25 +00:00
Julia Reynolds
74c6c21b96 Merge "Allow DND screens on low ram devices" into rvc-qpr-dev 2020-08-04 13:27:06 +00:00
Bonian Chen
a7ab2335ec [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours am: 633fb21411 -s ours am: 08e0f19067 -s ours am: ec6100243b -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: Iefef9fc9ed8d5a533193259fd8033a219b6070d0
2020-08-04 12:30:35 +00:00
Bonian Chen
c014240ca7 [automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours am: d35e25c295 -s ours am: fe652a5641 -s ours am: 2d0b2a0c3f -s ours am: b618a0852a -s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history

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

Change-Id: I7ffbbbb59cdf49c9004092bbd8b6d3f566451682
2020-08-04 12:30:02 +00:00
Bonian Chen
ec6100243b [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours am: 633fb21411 -s ours am: 08e0f19067 -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: I7c6cc702cbee2f45187bc58c994a11f1f59471e5
2020-08-04 12:06:52 +00:00
Bonian Chen
b618a0852a [automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours am: d35e25c295 -s ours am: fe652a5641 -s ours am: 2d0b2a0c3f -s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history

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

Change-Id: I75693bfcd6579fccb6d11041b152cd3c7eeb23ac
2020-08-04 12:06:42 +00:00
Bonian Chen
08e0f19067 [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours am: 633fb21411 -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: Ia75fb4de72f25ce6fbfc74f926262eff63b3bede
2020-08-04 11:52:26 +00:00