Commit Graph

75557 Commits

Author SHA1 Message Date
Edgar Wang
01c4a32195 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: If69691157079221158440ab26eace10dedf38b55
Test: robotest & manual
2020-08-06 16:09:34 +00:00
Bonian Chen
5b01d70d8c [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: I00d35bda613fcba39b0cd5356cc1bb488d118f2f
2020-08-06 16:06:57 +00:00
Bonian Chen
b0e6b28c4b [automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c am: 28e5351779 -s ours
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585 is in history

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

Change-Id: I3aed4bd7866c29d049a454fa3bc22511cc3aad6c
2020-08-06 16:06:50 +00:00
Bonian Chen
cce627f7a7 [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: Icb6307eb82260d281a381975eff6607505ba5455
2020-08-06 16:06:43 +00:00
Bonian Chen
5b79ed5ffa [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

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

Change-Id: I57ea4371d2effc3fd4a1ee9faac999014696599c
2020-08-06 16:06:35 +00:00
Bonian Chen
45bd473128 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

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

Change-Id: Id49648216c4f5d251c3fe1d817904d66aca04237
2020-08-06 16:05:56 +00:00
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
f07b05b7fc Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66 am: ce917cbad0 am: 94bce5c6dd am: 1d3b592e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: I952ec4f8b7dfe6471325ce1947a742d3f7f9947c
2020-08-06 12:16:26 +00:00
Bonian Chen
ef85688428 Merge "[Settings] Provide carrier name when manual network select" into rvc-d1-dev am: 65575cfb66 am: 64e70d916d am: 9b08bbac0f am: 0c67aefa72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12281209

Change-Id: Ide80e5a263d407f8cd4275dbdd2d736e143dac6a
2020-08-06 12:15:27 +00: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
8e0f959f0e Merge "[Wi-Fi] Fix thread leak in WifiConnectionPreferenceController" am: 3d2f50d842
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12323131

Change-Id: Id075be69fbb9d8cec6d357b7d2306f2e0754bfe9
2020-08-06 08:14:36 +00:00
TreeHugger Robot
3d2f50d842 Merge "[Wi-Fi] Fix thread leak in WifiConnectionPreferenceController" 2020-08-06 08:03:00 +00:00
tim peng
e48e30d542 Merge "Show all devices, including connected ones, into "Previously connected" page" am: eaf49d181c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12314422

Change-Id: I2b2fd6574cc528ece134d3da2e96bebda147ff2a
2020-08-06 07:22:56 +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
ec550a35a1 Merge "Update language to comply with Android's inclusive language guidance" am: dea18dff70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12292643

Change-Id: I0ffefbf546134e7baf40818871d25edc71350171
2020-08-06 06:49:38 +00: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
Betty Chang
ba6da9efc6 Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: ed0e76d073
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224011

Change-Id: Ie195f67bd1d742b37b2143b1d8a894b254c465a9
2020-08-06 06:42:00 +00: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
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
Stanley Wang
d4eb97903e Merge "Add search keyword for Font size preference of the Display page." am: bbe93a40ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12315683

Change-Id: I9c4dc7b6592cb8e71e9ed953a338993af7bb47e3
2020-08-06 03:11:26 +00:00
Bonian Chen
75b3666b02 Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" 2020-08-06 03:11:21 +00:00
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
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
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
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