Commit Graph

75614 Commits

Author SHA1 Message Date
Bonian Chen
3f3710dcb3 [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: aecd813846 -s ours am: 31c03589c3 -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: I6cd642453a6829a8c3e266e9a2c5fb9e2d1dbc18
2020-08-07 07:45:43 +00:00
Bonian Chen
31c03589c3 [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: aecd813846 -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: If0165edb086778132de6c66adaaa010c82a11c38
2020-08-07 07:36:57 +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
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
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
Automerger Merge Worker
b6b7dca947 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: 2ca8a4d3bb -s ours am: 09a3772e4c -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: I6d504cc050ed0ea9bea0a90d59bb48160e5f2e2a
2020-08-07 06:58:52 +00:00
Automerger Merge Worker
7d001f7ec9 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 am: a7a753e5ed -s ours am: 8403739a5a -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: I74e5d5e04b7cb8e5fb7c5f596f597c96d4e00011
2020-08-07 06:58:45 +00:00
TreeHugger Robot
006f3052db [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: 39ba1e0c8d -s ours am: 080517d5ae -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: I8b83a4c2f89f1183dff38eac03db03067c897d95
2020-08-07 06:58:39 +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
Automerger Merge Worker
09a3772e4c 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: 2ca8a4d3bb -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: Ie3a1e62eedd227cfdf3561b02cc9f9e9ac27dda1
2020-08-07 06:49:20 +00:00
Automerger Merge Worker
8403739a5a 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 am: a7a753e5ed -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: I45c3a45aab4f0d42887a4f55ec37f1614757127a
2020-08-07 06:49:14 +00:00
TreeHugger Robot
080517d5ae [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: 39ba1e0c8d -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: Ie0b1635a6c159d5dfd69330f4ba0d2ac1116c0a9
2020-08-07 06:49:06 +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
TreeHugger Robot
91939c0da8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours am: a05e3900c2 -s ours am: cc635deec0 -s ours am: f0a2c44548 -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: I4f942f2a7b98e81684b9a62320fcfa4aa04fb6ea
2020-08-07 06:31:41 +00:00
TreeHugger Robot
fddb801031 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours am: 0be7b479b7 -s ours am: 1c16c55c42 -s ours am: b448580d93 -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: Iefa7355a18c7de521bd2a2c3e1fe72cda2c22777
2020-08-07 06:31:13 +00:00
TreeHugger Robot
bb05f4ea25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 22b9581984 -s ours am: ef85937fb6 -s ours am: 6ad090341f -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: Ib35acef370d4a53360ed37d4b5b60daadcb1cfe4
2020-08-07 06:30:23 +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
TreeHugger Robot
f0a2c44548 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours am: a05e3900c2 -s ours am: cc635deec0 -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: Ic0752c5f9df12573f1b6a191c588c286fc9d9481
2020-08-07 06:18:00 +00:00
TreeHugger Robot
b448580d93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: bdd997c335 -s ours am: 0be7b479b7 -s ours am: 1c16c55c42 -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: I2b98d39c7accaaaaab4aca4cc695cfb85b035c1e
2020-08-07 06:17:52 +00:00
TreeHugger Robot
6ad090341f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 22b9581984 -s ours am: ef85937fb6 -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: Ia6d18612e7c5e2157eaeb84c275c70a2e19795fe
2020-08-07 06:17:15 +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
Bonian Chen
6844638ae5 [automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 am: 5bf89f4f5a -s ours am: 85ace93774 -s ours am: 911a4f6734 -s ours am: f77ace88c6 -s ours am: b919709bf2 -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: I5c49f23506bf22a32d2aaf7db34ada18e8ab90b7
2020-08-07 05:33:57 +00:00
Bonian Chen
45b1b2f80f [automerger skipped] Merge "[Settings] Code refactor" am: 2410478bee am: 43a78331d5 -s ours am: deb24b6aec -s ours am: 2d98b88ddb -s ours am: c7807d7c3f -s ours am: 5ef22751c3 -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: Iceedc7de7037f4f6e500b792311a1f16312e96cb
2020-08-07 05:33:37 +00:00
Bonian Chen
b919709bf2 [automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4 am: 5bf89f4f5a -s ours am: 85ace93774 -s ours am: 911a4f6734 -s ours am: f77ace88c6 -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: I05f3845325a47ffae8960ec427627e2372c026be
2020-08-07 05:23:46 +00:00
Bonian Chen
5ef22751c3 [automerger skipped] Merge "[Settings] Code refactor" am: 2410478bee am: 43a78331d5 -s ours am: deb24b6aec -s ours am: 2d98b88ddb -s ours am: c7807d7c3f -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: If1b3efc1fb667fe20ce8588c63f311a5addcc6ae
2020-08-07 05:23:27 +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
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