Commit Graph

75419 Commits

Author SHA1 Message Date
Stanley Wang
f1294d6835 Merge "Enable the copy function on the account preference of About page." am: 24e29f08e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12314424

Change-Id: I20f4ed40cc414b5f7ccbd56e99af1f09a3fd2d59
2020-08-06 03:11:14 +00:00
Stanley Wang
24e29f08e6 Merge "Enable the copy function on the account preference of About page." 2020-08-06 02:53:59 +00:00
TreeHugger Robot
69277fdb0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3a44ea5f5b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I048447c4af071611cabae441d4112a2d2733b01b
2020-08-05 22:28:47 +00:00
TreeHugger Robot
3a44ea5f5b Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-05 22:11:08 +00:00
TreeHugger Robot
51adc11452 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 39297cbc9a -s ours am: 1206fa90b7 -s ours am: 11499d9cc5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70db2beda6fb59f001b06a79653303c3b8588179
2020-08-05 21:16:52 +00:00
TreeHugger Robot
11499d9cc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 39297cbc9a -s ours am: 1206fa90b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0a86f2b0593dc114a63e9be6e03dbb97a329aff
2020-08-05 20:53:14 +00:00
TreeHugger Robot
1206fa90b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 39297cbc9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic26d1bf156914ecfc35139d635bbd6b9403e1f2d
2020-08-05 20:25:48 +00:00
TreeHugger Robot
39297cbc9a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-05 20:08:28 +00:00
Dmitri Plotnikov
5aa1c26bdb Merge "Adjust for changing BatteryStats.Uid API" am: ea27b5d092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12184541

Change-Id: Ib7f67bb9b371db1eaeb15bceb50e8494ec178603
2020-08-05 18:29:08 +00:00
Dmitri Plotnikov
ea27b5d092 Merge "Adjust for changing BatteryStats.Uid API" 2020-08-05 18:15:16 +00:00
TreeHugger Robot
deeb9592af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 97111a5b06 -s ours am: a85027b54d -s ours am: 0fe539856d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7be00abaf627f57451fcf7d3e329efdf59007363
2020-08-05 17:18:46 +00:00
TreeHugger Robot
bc3a9018e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 66de015218 -s ours am: c650b43096 -s ours am: 44820e85f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69b10fe0b00dd49ded567524af114e005b6187ed
2020-08-05 17:18:38 +00:00
TreeHugger Robot
0fe539856d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 97111a5b06 -s ours am: a85027b54d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I857452532acf4b758d20e28a681243096941ee89
2020-08-05 16:59:52 +00:00
TreeHugger Robot
44820e85f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 66de015218 -s ours am: c650b43096 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b8bf98173d59477800f1bf93b33a51868607a6d
2020-08-05 16:59:43 +00:00
TreeHugger Robot
a85027b54d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 97111a5b06 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9fd6544fa4aff7cad11b130e2ef4656d6b8ee5d
2020-08-05 16:45:19 +00:00
TreeHugger Robot
c650b43096 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours am: 66de015218 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75d51f715fac716c220cf0ce0bf788e16334c1c0
2020-08-05 16:44:07 +00:00
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
TreeHugger Robot
97111a5b06 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieeba808f8bdd5411d905ff4413d4a8813179a709
2020-08-05 16:22:41 +00:00
TreeHugger Robot
66de015218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 03521b9303 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I955b425cf9235fe2e41e036109cd7ccfe8648ac3
2020-08-05 16:21:25 +00:00
Bill Yi
afc251ea5a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6518148222b34a437609717c4dc737247adb271a
2020-08-05 16:17:35 +00:00
Sally Yuen
d7e22a9c8c Merge "Add grayscale support" 2020-08-05 16:12:28 +00:00
TreeHugger Robot
03521b9303 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-05 16:10:14 +00:00
Bill Yi
4c876eca6d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I357bb95fca88b3534eec4167af19267202cf3f8e
2020-08-05 15:08:08 +00:00
Bill Yi
a11a26cdbf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I54e58debc730f1459809075a2c0cabc411ebce6e
2020-08-05 14:33:42 +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
Stanley Wang
56361da8fc Enable the copy function on the account preference of About page.
Fixes: 137255130
Test: robotest and do the copy test manually
Change-Id: Idfdd7b5417ae41fce3710cad4aa7a735e99903f0
2020-08-05 17:40:53 +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
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