Bonian Chen
e1d58f6977
[automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef
am: f257197d96
-s ours am: 009f7ec40d
-s ours
...
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I974456eb70254ce7289056b21e361004d9e753f0
2020-08-05 09:57:29 +00:00
Bonian Chen
5c1fbcc7d1
[automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee
am: d03c8bfb1c
-s ours am: 4cd2283768
-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: Ia80619e1f81201331d7168cb2c0ceb76c10792a6
2020-08-05 09:57:16 +00:00
Bonian Chen
80edde750a
[Settings] Enable access from non-UI thread
...
To support query from settings intelligent, these listeners need to
support accessing from non-UI thread.
Bug: 149543756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Merged-In: I768f41f76d0223634be2b728d33fa0cfcc69fe69
Change-Id: I5d076d95410a2d904f8ebb1d82df90dd6aa52099
2020-08-05 17:55:12 +08:00
Bonian Chen
009f7ec40d
[automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef
am: f257197d96
-s ours
...
am skip reason: Change-Id I6d7e72a656723c0620d579e1e223945e2a3588af with SHA-1 e30517f9a5
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390058
Change-Id: I7b4659c785548541a4062c4336b31b7e6b8e3ed3
2020-08-05 09:38:25 +00:00
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
e03c8378cd
[automerger skipped] Merge "Mainline: removed legacy UI for network selection mode." am: 6afb84d6b2
am: 0f951e1b90
-s ours am: 9a8905db00
-s ours am: 42e2ea2997
-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: I94a97a6b23d2a363aa20e9f936d97747ce51b130
2020-08-05 08:16:16 +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
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
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
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
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
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
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
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
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
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
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
Bonian Chen
2d0b2a0c3f
[automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061
am: 6a4d09c4ed
-s ours am: d35e25c295
-s ours am: fe652a5641
-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: Iadfbb00c1a6ea41d3e6633a8b4156549939e06c2
2020-08-04 11:52:10 +00: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
Sunny Shao
828210acda
[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: 6dc6e78cc4
-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: Ic41c1c4edbec8237b8dfb997a17fcd37b51fa965
2020-08-04 10:55:26 +00:00
Jakub Pawlowski
bae9a9e47b
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
am: ee42cb271c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057
Change-Id: I61d10981c9e948ffd161ada3860401dd9901e7db
2020-08-04 10:55:17 +00:00
Jakub Pawlowski
38791c1984
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
am: 134c2f20a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056
Change-Id: I02a97cae08b74e4bfeaa2c355b1c2b35a0e93523
2020-08-04 10:54:54 +00:00