Bonian Chen
f9803fc6c2
[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02
am: 0a1d15530b
-s ours
...
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547
Change-Id: I2c9008cb50c9de6a36eefa1aa2a20268696628ce
2020-08-06 16:05:36 +00:00
Bonian Chen
e60cb2f67b
[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
am: f42a022a8f
-s ours
...
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: Ibb8c7d6fa353f6e6036ed355a9a24490b181cb5d
2020-08-06 16:03:52 +00:00
Xin Li
761d56988b
Merge "Merge QQ3A.200805.001" am: cded32987b
am: dcaeff56e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671
Change-Id: I185588633bf511b2389c2f69cf35717ae6d746a6
2020-08-06 16:02:18 +00:00
Bonian Chen
0f68ecf2ee
[Settings] Remove Phone hidden constants access
...
Remove access to:
1. Phone.CDMA_SUBSCRIPTION_UNKNOWN
2. Phone.PREFERRED_NT_MODE
3. Phone.PREFERRED_CDMA_SUBSCRIPTION
Bug: 147794713
Test: manual
Merged-In: I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38
Change-Id: I438afb81ccad20971a15eb1fe0af7d37202c6a88
2020-08-06 23:58:24 +08:00
Bonian Chen
f84f6e49ee
[Settings] Code refactor
...
Minor code refactor
Bug: 141833767
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsagePreferenceControllerTest
Merged-In: I060e7c880d91a0e5059610c5ceae319d47c19c7a
Change-Id: I378b3c7ad5531efd5f2dad4bdafbcddacaf66db4
2020-08-06 23:24:29 +08:00
Peter_Liang
2387212823
Fix the screen scrolling down after enabling dark theme.
...
Root Cause:
Dynamically update preferences behind onCreate lifecycle.
Solution:
Move it to previous lifecycle.
Bug: 139877200
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilitySettingsTest
Change-Id: I1638a8b2d48369ec1ea0b996fbed09233c5e3649
2020-08-06 21:22:19 +08:00
Bonian Chen
1d3b592e56
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: ce917cbad0
am: 94bce5c6dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: Ie05fbaae507e038427d941dd7c7f79e229227315
2020-08-06 11:56:36 +00:00
Bonian Chen
0c67aefa72
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: 64e70d916d
am: 9b08bbac0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: Ieccbdaea6b61b1725a41c7defba3be9a32ab173b
2020-08-06 11:56:27 +00:00
Bonian Chen
94bce5c6dd
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: ce917cbad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: I9aa360b4545d71bc8149a6b1ef271123ff0843b9
2020-08-06 11:40:33 +00:00
Bonian Chen
9b08bbac0f
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
am: 64e70d916d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: I7fe5607853940a426e05061e3b1ced7a55f389b6
2020-08-06 11:39:23 +00:00
Bonian Chen
ce917cbad0
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: I8a3f2baa2d505eaf3e61ad1a5e4022d3b70e0638
2020-08-06 11:23:11 +00:00
Bonian Chen
64e70d916d
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209
Change-Id: Ia8c30b0ff0fcbe4720264105edf8c7ad16353b5a
2020-08-06 11:21:50 +00:00
Bonian Chen
65575cfb66
Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev
2020-08-06 11:04:29 +00:00
TreeHugger Robot
3d2f50d842
Merge "[Wi-Fi] Fix thread leak in WifiConnectionPreferenceController"
2020-08-06 08:03:00 +00:00
tim peng
eaf49d181c
Merge "Show all devices, including connected ones, into "Previously connected" page"
2020-08-06 07:07:31 +00:00
Edgar Wang
dd032d3734
Update inclusive language for Accessibility Settings
...
Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 161896447
Test: robotest & manual
Change-Id: I67032d4beb7c8ae6b5a3271ea75ca38be4351484
2020-08-06 14:51:19 +08:00
Arc Wang
3157be53fc
[Wi-Fi] Fix thread leak in WifiConnectionPreferenceController
...
Stop the worker thread for WifiPickerTracker at onDestroy
event. The event will be triggered when users click back button
at 'Network & internet' page.
Bug: 161659380
Test: manual
1. Launch Settings 'Network & internet'.
2. Use below command to observe the thread.
ps -T SettingsProcessId | grep WifiConnPrefCtr
3. Click back button and use the command again,
the thread should not exist.
Change-Id: I9145d534ade168beca52524e7cf85d87e2feb1a0
2020-08-06 14:47:43 +08:00
Edgar Wang
dea18dff70
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-06 06:31:49 +00:00
Betty Chang
ed0e76d073
Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest"
2020-08-06 06:29:23 +00:00
Bonian Chen
7b7b900fa3
Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391158
Change-Id: Id5642816c285ca5fe0f0ea13d9e159bdacdcfd4f
2020-08-06 06:22:31 +00:00
Bonian Chen
28e5351779
Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390817
Change-Id: I0c69063cb7e4e0e689c00cfeeea56d63fc878568
2020-08-06 06:22:21 +00:00
Bonian Chen
4b755362e6
Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1390856
Change-Id: I03e90f8a04f7f50b5314e51e097b1388166e0f37
2020-08-06 06:22:09 +00:00
Bonian Chen
bb750ad2d7
Merge "[Settings] Avoid from EUICC access blocking main thread"
2020-08-06 06:05:35 +00:00
Bonian Chen
9ec200f85c
Merge "[Settings] Enable access from non-UI thread"
2020-08-06 06:05:29 +00:00
Bonian Chen
35f53d7fbd
Merge "[Settings] Sync summary of call preference with dialer"
2020-08-06 06:05:17 +00:00
Arc Wang
cf6ab33e71
[adb-wireless] Allow users copy 'IP address & Port' in Wireless debugging
...
After this change, users can long press 'IP address & Port'
and use Copy button.
Bug: 162965202
Test: manual
Long press 'IP address & Port' and use Copy button.
Change-Id: Ib3d131fef9cd18230844fc13a63bb9ab9bf07d2e
2020-08-06 13:55:31 +08:00
Bonian Chen
fc47bff681
Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160
Change-Id: I69cb17780ba0a519420557977398c2f86cda1118
2020-08-06 04:41:30 +00:00
Bonian Chen
96533385f0
Merge "[Settings] Access ProxySubscriptionManager within DataUsage"
2020-08-06 04:21:45 +00:00
Bonian Chen
44fbf04469
Merge "Remove useless png and add vector drawable" am: 0cfec664c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392546
Change-Id: I6875e7a5e7b41b178f54999b49b346f62d4bcb6a
2020-08-06 03:32:18 +00:00
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