Commit Graph

75395 Commits

Author SHA1 Message Date
Sally Yuen
338a27bb18 Merge "Add grayscale support" am: d7e22a9c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12307029

Change-Id: I5d1309297a432ca5900a750288f7c57db6ffb1f7
2020-08-05 16:32:52 +00:00
Sally Yuen
d7e22a9c8c Merge "Add grayscale support" 2020-08-05 16:12:28 +00:00
TreeHugger Robot
04ea8f27bb Merge "Refactor Reset options Settings" am: 85dbce6241
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12295378

Change-Id: I64ae9b701008ffe27e6aae6443c9aa527ad8d84f
2020-08-05 12:50:08 +00:00
TreeHugger Robot
85dbce6241 Merge "Refactor Reset options Settings" 2020-08-05 12:35:37 +00:00
Bonian Chen
1c414dfd0e [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours am: 009f7ec40d -s ours am: e1d58f6977 -s ours am: 1fadfc451c -s ours am: 3099c7d02d -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: I6014c6e9e0a582601c4c41dc99374f4701047a3d
2020-08-05 10:39:57 +00:00
Bonian Chen
ea0cddad10 [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours am: 5c1fbcc7d1 -s ours am: 9283706109 -s ours am: f2929f3dab -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: Ic9f96bef9ab32f7a98b98c665a2b10f52a4ae107
2020-08-05 10:39:42 +00:00
Bonian Chen
3099c7d02d [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours am: 009f7ec40d -s ours am: e1d58f6977 -s ours am: 1fadfc451c -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: I835faabc9d73841ef35ced34cff0c220e3c2afa3
2020-08-05 10:29:58 +00:00
Bonian Chen
f2929f3dab [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours am: 5c1fbcc7d1 -s ours am: 9283706109 -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: Ida6bce6b8a04b17a2040566f3ed865a28297f81a
2020-08-05 10:29:36 +00:00
Bonian Chen
1fadfc451c [automerger skipped] Merge "[Mainline] Copy the method getSelectableSubscriptionInfoList from SubscriptionManager to Settings" am: 3e545f2bef am: f257197d96 -s ours am: 009f7ec40d -s ours am: e1d58f6977 -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: I486c5f5becc1e4c624f1c74a17dccd5eb2fe490c
2020-08-05 10:15:07 +00:00
Bonian Chen
9283706109 [automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours am: 5c1fbcc7d1 -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: Ie6f2aeb9d71bd96f00b5c592a4a483e69e2041aa
2020-08-05 10:14:48 +00:00
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
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
2af230db7c [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: e03c8378cd -s ours am: d0a493be2a -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: I4a5415d6c60a266ca37351f1ddf5d78118a68c90
2020-08-05 08:54:39 +00:00
Bonian Chen
d0a493be2a [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: e03c8378cd -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: I6e7925ae8e07ea851b6387988d13dbbaee395f1a
2020-08-05 08:38:36 +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
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
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
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
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
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
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
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