Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,506 Commits 1 Branch 0 Tags
32fe945e0dfd70d7706d4dcaac9effa5d57540c1
Commit Graph

75506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
32fe945e0d [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -s ours am: fb8293a152 -s ours am: a61d07c2f4 -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: I4019647f5227a788ade8ba883b91919debd67326
 2020-08-06 17:29:02 +00:00
Bonian Chen
d115d130a7 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours am: b77aaf8055 -s ours am: 49a060496f -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: Ib5a5d688c8f4056bc11c3ade3010514203361088
 2020-08-06 17:27:51 +00:00
Bonian Chen
b52eedadb2 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours am: 8f8468fd08 -s ours am: 28b81ab03d -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: If405a1121e97931d1229cc5a6e7f15fcb38af09a
 2020-08-06 17:27:30 +00:00
Xin Li
ab83ad777e Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da am: ff75eec671 am: 2412da9a44 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I119a79df453a1146af3a44d5b270a942bfdc739c
 2020-08-06 17:23:56 +00:00
Bonian Chen
a61d07c2f4 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -s ours am: fb8293a152 -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: I4fbf8de036f37012b9a8860e403d657d6e0d99ce
 2020-08-06 17:11:46 +00:00
Bonian Chen
49a060496f [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours am: b77aaf8055 -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: I0bf95079d8eb2a73c616c8647c02e2a04a68ae7e
 2020-08-06 17:10:14 +00:00
Bonian Chen
28b81ab03d [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours am: 8f8468fd08 -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: Ibf47cd2ab147b636015b3d22912bfc74b5d41fca
 2020-08-06 17:09:30 +00:00
Xin Li
2412da9a44 Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da am: ff75eec671 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: Ice1f181ad4d9b7a5ff5c8a1359fe9acfc1f5bb95
 2020-08-06 17:06:29 +00:00
Bonian Chen
fb8293a152 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -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: I25ab1624f08db239b6d0783aa580722a649804db
 2020-08-06 16:54:14 +00:00
Bonian Chen
b77aaf8055 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -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: Iee0800365e6a9ca0ca27b0482baa5d8d220ca46c
 2020-08-06 16:53:03 +00:00
Bonian Chen
8f8468fd08 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -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: Iaef18fc04be9b7d94cb84655dca15d9479778f1d
 2020-08-06 16:51:16 +00:00
Xin Li
ff75eec671 Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I71a23041e53c6f666bcba7360f07917fdbcab96b
 2020-08-06 16:48:26 +00:00
Bonian Chen
db44ed63d8 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -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: I872d489107430b37a8123482a1a12474cb5226ce
 2020-08-06 16:35:47 +00:00
Bonian Chen
4486da9ea9 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -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: I5fd41f91894c3596eb24935b9ddc17dac3d4ddf5
 2020-08-06 16:35:39 +00:00
Bonian Chen
339c352ac3 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -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: Ibf4937b0c5da38d7102def87014b475e01b6cc55
 2020-08-06 16:35:21 +00:00
Xin Li
c9e538e9da Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: Idcf8e17d4ace8b00c4a8c76c25e25840ae880874
 2020-08-06 16:22:27 +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
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