Bonian Chen
4cd2283768
[automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee
am: d03c8bfb1c
-s ours
...
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128
Change-Id: I63570338e4a096b494917f3bff58071e609c545f
2020-08-05 09:38:12 +00:00
Bonian Chen
f257197d96
Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I7754cefefd1224608fe879c36e00307d6777bc79
2020-08-05 09:20:21 +00:00
Bonian Chen
d03c8bfb1c
Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128
Change-Id: I3d4187956b376cf2a8138df5cdad4263c6b7b31c
2020-08-05 09:20:10 +00:00
Bonian Chen
3e545f2bef
Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings"
2020-08-05 09:16:55 +00:00
Bonian Chen
d3c8a4c3ee
Merge "Mainline remove hide api SubscriptionInfo.getCardString"
2020-08-05 09:03:44 +00:00
Bonian Chen
42e2ea2997
[automerger skipped] Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2
am: 0f951e1b90
-s ours am: 9a8905db00
-s ours
...
am skip reason: Change-Id I1a0f431f05268d29afce145c3eb720594cfc57a3 with SHA-1 affe5406a6
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134
Change-Id: I32bf304657f087b89728153ddb6ad39b0c8bc59c
2020-08-05 07:58:51 +00:00
Bonian Chen
9a8905db00
[automerger skipped] Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2
am: 0f951e1b90
-s ours
...
am skip reason: Change-Id I1a0f431f05268d29afce145c3eb720594cfc57a3 with SHA-1 affe5406a6
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134
Change-Id: I8934f8d9b4bd46d2cd8daf03d34c138357b1f40e
2020-08-05 07:35:15 +00:00
Bonian Chen
0f951e1b90
Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387134
Change-Id: I8161ffae6bbe96c93dafa3328cb2fdad6614b4d9
2020-08-05 07:12:12 +00:00
changbetty
310eeebe5c
[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings
...
Bug: 147206736
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionUtilTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileDataSliceTest
Merged-In: I6d7e72a656723c0620d579e1e223945e2a3588af
Change-Id: I99b63b33395641ecd0b00997fa3792bbd59efeda
2020-08-05 15:08:59 +08:00
SongFerngWang
888e9cbdf9
Mainline remove hide api SubscriptionInfo.getCardString
...
Bug: 147128878
Test: build pass
Merged-In: Idb44af6a01626013339f5ca05486dd11112a5867
Change-Id: Ib222c08bc4baa3fdcaea1fa2020d7de6d6a4fcec
2020-08-05 07:07:11 +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
6afb84d6b2
Merge "Mainline: removed legacy UI for network selection mode."
2020-08-05 06:56:38 +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
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
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
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
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
SongFerngWang
7e045ab9f6
Mainline: removed legacy UI for network selection mode.
...
This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: build pass
Merged-In: I1a0f431f05268d29afce145c3eb720594cfc57a3
Change-Id: I54ed8c69edcdc618f8cf8df8af0fffc8c4f187e8
2020-08-05 12:58:53 +08: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
3d88c92bb3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I10b1f760c4f7e55be7feef9dfe6e1881fd07d85f
2020-08-05 01:00:16 +00:00
Xin Li
d2b2a4e126
Merge QQ3A.200805.001
...
Bug: 162879794
Merged-In: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
Change-Id: I1129dba865eb6acaa047bc43e3057d02d8528ff0
2020-08-04 15:30:39 -07:00
Bonian Chen
633fb21411
[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
am: 603dcc1856
-s ours am: 0f7a0642de
-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: Ie129b1d13ee9f466741127d55dc2e505e51ba3e3
2020-08-04 11:30:54 +00:00
Bonian Chen
fe652a5641
[automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
am: 6a4d09c4ed
-s ours am: d35e25c295
-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: I68bdb1e2c58467b7d79a2fcfd6461f284835478e
2020-08-04 11:30:38 +00:00
Bonian Chen
0f7a0642de
[automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
am: 603dcc1856
-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: I715e838ade3a2eae24736c8fef55c18f21670a41
2020-08-04 11:05:32 +00:00
Bonian Chen
d35e25c295
[automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
am: 6a4d09c4ed
-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: I20ef63c25a5ea334d75cbacc57664d6cb9defa29
2020-08-04 11:05:19 +00:00
Malcolm Chen
3805373f90
Remove logic to manually search inactive pSIM.
...
Nowe inserted inactive pSIM will be included in Telephony's get
available and get selectable subInfo list so that logic is no longer
needed.
Bug: 147128878
Test: unittest
Merged-In: Icd131f133e47dae0770a4da71c51de3c2a94b42b
Change-Id: I9ba5dded7817116c02d70298c9c271ff6a99925b
2020-08-04 18:57:37 +08:00
Bonian Chen
603dcc1856
Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124
Change-Id: Id886131d82e274572e4277ed8d8f0f61513a8d65
2020-08-04 10:41:58 +00:00
Bonian Chen
6a4d09c4ed
Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387120
Change-Id: I79a3a67123c110eb2ccbba5c0e54598bcc99c86e
2020-08-04 10:41:43 +00:00
Bonian Chen
9057a78bfa
Merge "[Settings] Avoid crash when switch SIM during PIN lock"
2020-08-04 10:37:12 +00:00
Bonian Chen
76bd28fe60
[Settings] Data roaming warning only when turn ON
...
handlePreferenceTreeClick() goes after setChecked() however
configuration may have been altered within setChecked().
Follow same design within MobileDataPreferenceController to fix this
issue. A boolean state will be maintained as the condition when warning
dialog is required when click.
Bug: 148491064
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Merged-In: I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d
Change-Id: I2f9998e87b053c8d30af48f977ef58a7fe9ea829
2020-08-04 18:35:13 +08:00
Sunny Shao
d94f74a752
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628
-s ours am: b2eac1654f
-s ours am: e615d96b9b
-s ours am: 6a0a44ba16
-s ours am: 5181948f08
-s ours am: bd78f5d4d3
-s ours am: c101eac32b
-s ours am: 3a4190e88b
-s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: I348df82088558266700eb60cbc1df190fadd61a5
2020-08-04 10:31:27 +00:00
Jakub Pawlowski
00950b7d6d
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423
am: 2094f01676
am: 0b7ce7660c
am: fa8d015bdb
am: 682c00d893
am: 62ec2b5aa0
am: 01251764ce
am: 3afa3cd405
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I7d86ff7d09f0d446a49b499abbb5e3d7627c7fcb
2020-08-04 10:31:19 +00:00
Jakub Pawlowski
661788efbb
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8
am: a0c963ba95
am: 368fc30e37
am: 988d9633c2
am: ea460a8527
am: 7d38515814
am: a4e4323fc1
am: 4f1d128ffa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I7cb945cfdbf944ce05b394f13f214a3f002e9fdb
2020-08-04 10:31:05 +00:00
Sunny Shao
6301cef017
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d
am: fcc0b2872d
-s ours am: e791be54f2
-s ours am: 83cadecf04
-s ours am: 0240abd711
-s ours am: fd9977a094
-s ours am: a1e734b558
-s ours am: 566e54e616
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: If85a5bbfc053a65d8897da3bd03f5ac0844b59f7
2020-08-04 10:30:51 +00:00
Mill Chen
1d3ffe6578
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2
-s ours am: 5045f120af
am: 7bdd4b3273
-s ours am: 5f16b03f50
-s ours am: c54d68ea09
am: d3abc029bc
-s ours am: 57f93997d7
am: d988a5ca4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: Idbaa28a3b370e7b264d04745b3a5f00a2dc2d2fb
2020-08-04 10:30:33 +00:00
Mill Chen
66dda042e3
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae
-s ours am: a6a08263f2
am: 1958831a8c
am: 5c7ca93bf1
am: 2bbc2529a8
am: 60d8cc727d
am: a2ef19bb97
am: 1202e45210
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781
Change-Id: If2a8c829cb839ebf25e1a6c3d58f9ea5add147bd
2020-08-04 10:30:05 +00:00
Sunny Shao
1fd688bd67
[automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628
-s ours am: b2eac1654f
-s ours am: e615d96b9b
-s ours am: 6a0a44ba16
-s ours am: 5181948f08
-s ours am: bd78f5d4d3
-s ours am: c101eac32b
-s ours am: 644c6af4fb
-s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12069381
Change-Id: I3816f557e640da743989c5e11040cbe46949f447
2020-08-04 10:29:39 +00:00
Jakub Pawlowski
1afe980769
Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423
am: 2094f01676
am: 0b7ce7660c
am: fa8d015bdb
am: 682c00d893
am: 62ec2b5aa0
am: 01251764ce
am: 06828a4a9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I26be433058320294bea75ffdf809863e6cdfd819
2020-08-04 10:29:32 +00:00
Jakub Pawlowski
f8fa5e3831
Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8
am: a0c963ba95
am: 368fc30e37
am: 988d9633c2
am: ea460a8527
am: 7d38515814
am: a4e4323fc1
am: 797fb6d0af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I70ef98a8224b9289603fbe65bab22b9e450a22ef
2020-08-04 10:29:19 +00:00
Sunny Shao
c8ad5dc6c4
[automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d
am: fcc0b2872d
-s ours am: e791be54f2
-s ours am: 83cadecf04
-s ours am: 0240abd711
-s ours am: fd9977a094
-s ours am: a1e734b558
-s ours am: 7d05af5388
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11489506
Change-Id: I2c5e208a6367963922bada32823bda320cc45c27
2020-08-04 10:29:06 +00:00
Mill Chen
265af06fb4
[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2
-s ours am: 5045f120af
am: 7bdd4b3273
-s ours am: 5f16b03f50
-s ours am: c54d68ea09
am: d3abc029bc
-s ours am: 57f93997d7
am: b5a0b4f7a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450
Change-Id: I687679f6b0cee0dc91e28bf57f80e3e3f2ba355f
2020-08-04 10:28:57 +00:00
Mill Chen
1bcd658339
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae
-s ours am: a6a08263f2
am: 1958831a8c
am: 5c7ca93bf1
am: 2bbc2529a8
am: 60d8cc727d
am: a2ef19bb97
am: 4828c73931
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781
Change-Id: I749f6b386d88d6f6fc7630eb050ca8d23f8d0289
2020-08-04 10:28:38 +00:00
Bonian Chen
eff795f061
Merge "mainline: remove CarrierConfigManager.init"
2020-08-04 10:20:18 +00:00
SongFerngWang
87af2abc83
mainline: remove CarrierConfigManager.init
...
Bug: 147469789
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Merged-In: I2a72d409574fc281e5de57d58a27551dd040d551
Change-Id: I2535275d116887ed4b107fc530c85b4cbc5ad0d5
2020-08-04 10:18:54 +00:00