Bonian Chen
0a1d15530b
Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547
Change-Id: Ibcaea10f983975809aa97635239f3b6850a22e9c
2020-08-06 03:32:07 +00:00
Bonian Chen
0cfec664c4
Merge "Remove useless png and add vector drawable"
2020-08-06 03:11:56 +00:00
Bonian Chen
75b3666b02
Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline"
2020-08-06 03:11:21 +00:00
Stanley Wang
bbe93a40ad
Merge "Add search keyword for Font size preference of the Display page."
2020-08-06 02:54:27 +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
changbetty
f1a52da792
[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline
...
Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DisabledSubscriptionControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSwitchControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=SimSelectNotificationTest
Merged-In: If740c2d7ea2c1392d5fe538091ea6e5c4575ad26
Change-Id: Idca7a76c591448a45ecc33cb392f416c70d32f91
2020-08-06 09:14:58 +08:00
Raff Tsai
cbd234e1c1
Remove useless png and add vector drawable
...
Bug: 139336138
Test: visual
Merged-In: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c
Change-Id: If7de9126c8afab3422999db66ad9b7a179334f10
2020-08-06 09:03:32 +08:00
Bonian Chen
f42a022a8f
Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: I051cd4ac15732c3fa4e5b93ee2af768fcfd21956
2020-08-05 23:03:03 +00:00
Bonian Chen
e24a23f9ab
Merge "Look up CBS package name through PackageManager."
2020-08-05 22:44:23 +00:00
TreeHugger Robot
3a44ea5f5b
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-08-05 22:11:08 +00:00
Xin Li
dcaeff56e3
Merge "Merge QQ3A.200805.001" am: cded32987b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671
Change-Id: I36aaf8b9f26c71377d1c6c64396e2eb5cb2114bb
2020-08-05 21:19:11 +00:00
Xin Li
cded32987b
Merge "Merge QQ3A.200805.001"
2020-08-05 21:05:34 +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
ea27b5d092
Merge "Adjust for changing BatteryStats.Uid API"
2020-08-05 18:15:16 +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
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
Bonian Chen
12c22d8066
[Settings] Access ProxySubscriptionManager within DataUsage
...
Redirect some SubscriptionManager access to ProxySubscriptionManager.
This will reduce some access latency.
Bug: 141833767
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Merged-In: I2cb30dd0570a09543a13ca01cf054ba2d18d70d4
Change-Id: I536b45fd5ddd5d9d9591a133a0f79227a670d7dd
2020-08-05 23:04:45 +08:00
changbetty
c3aa6d26ee
[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest
...
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
Bug: 162048313
Test: atest -c MobileDataEnabledListenerTest
Change-Id: I81b3d6ac075666a45649c8d811832a40bdb1b41b
2020-08-05 22:53:29 +08: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
Bonian Chen
95d85a0742
[Settings] Avoid from EUICC access blocking main thread
...
Avoid from EUICC accessing form main thread and timeout if API takes too
much time.
Bug: 143996139
Test: manual
Merged-In: Ic1a2bd948b69d40632555d293df6ed56a6b7a712
Change-Id: Ia2a15ee43ce2b49b90c8d0626aee939c536aea56
2020-08-05 22:17:50 +08:00
Amit Mahajan
42d1d4be6b
Look up CBS package name through PackageManager.
...
Instead of hardcoding it.
Test: manual
Bug: 154436403
Merged-In: I0feb356e6cd4868f71198bdee49a7658b4b98b5d
Change-Id: I9b3b3464614eac7394434e55eb142bc1053e8758
2020-08-05 21:58:45 +08:00
TreeHugger Robot
85dbce6241
Merge "Refactor Reset options Settings"
2020-08-05 12:35:37 +00:00
timhypeng
9743fed57d
Show all devices, including connected ones, into "Previously connected" page
...
-Add connected devices in "Previously connected" page
-Set active when clicking a connected device
Bug: 147150246
Test: make -j50 RunSettingsRoboTests
Change-Id: I4422cd63c360a4387cedc4f80f34474b42f82a1f
2020-08-05 11:28:15 +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
Stanley Wang
ddf547f15b
Add search keyword for Font size preference of the Display page.
...
Add keyword "text size" for search.
Fixes: 161734505
Test: run robotest and observe the search result
Change-Id: I6522481d0f51abfeffb3f613207ef28b0d82a2be
2020-08-05 18:29:54 +08: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
defa3f47b5
[Settings] Sync summary of call preference with dialer
...
Replacing the display of summary part within Settings' calls preference
by VoIP account when configured calling account settings within Dialer.
The click behavior for calls preference remain unchanged, due to this is
the configuration for subscription (instead of for all kinds of
accounts).
Bug: 136277187
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Merged-In: Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8
Change-Id: I6f2f44d305119f09e2188de702f14f2506a4903c
2020-08-05 18:17:04 +08: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
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
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
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