Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,289 Commits 1 Branch 0 Tags
b61e67fc0c983b554dda25eca74d88065975fbc6
Commit Graph

30808 Commits

Author SHA1 Message Date
TreeHugger Robot
b61e67fc0c Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 am: bab104e792 am: 3e63e060a5 
Change-Id: I26ccf6d734195d059ec69b9af432bb5346f4562c
 2020-03-20 16:06:07 +00:00
TreeHugger Robot
bab104e792 Merge "Disable the sync now menu while no any synced item" into rvc-dev am: cdaf5d38b5 am: 4758893d86 
Change-Id: Ia276b3d9dc6080c7fb9e7626124091e29d13d351
 2020-03-20 15:57:36 +00:00
TreeHugger Robot
cdaf5d38b5 Merge "Disable the sync now menu while no any synced item" into rvc-dev 2020-03-20 15:25:04 +00:00
Joshua Duong
04bc02223e Merge changes from topic "adbwifi-bugs" 
* changes:
  Add toast error message for no WiFi on wireless debugging.
  Add visibility control to ADB QR code preference.
 2020-03-20 15:07:14 +00:00
Joshua Duong
564f6ba770 Add toast error message for no WiFi on wireless debugging. 
Show a toast to connect to a WiFi network when the user tries to
enable wireless debugging while not connected to any Wi-Fi network.

Bug: 150139061
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingEnablerTest

Change-Id: I389f5fddc874f60e8156ecf6ef2f1c6eddc1d7a5
Exempt-From-Owner-Approval: LGTM
 2020-03-20 15:05:28 +00:00
Automerger Merge Worker
6fad8f62f6 Merge "Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0" into rvc-d1-dev-plus-aosp am: 81299ce74d am: 106cf460f0 
Change-Id: I9518bc4eb9dc23aa34eae082e5426cae6a6ca4e3
 2020-03-20 11:49:39 +00:00
Bonian Chen
e2e597c538 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e am: 78b5db508b am: 5ec5ac505a 
Change-Id: I95b460761888220716bd2000976a01bc3ef92524
 2020-03-20 11:49:11 +00:00
Bonian Chen
d874f73d40 Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf am: e3d992094a am: 2f5b6f5350 
Change-Id: I73692312ef9e266cddac3e6581798bfaeb23793c
 2020-03-20 11:48:42 +00:00
Junyu Lai
b5b6a47ebc Merge "Adjust code for API council feedback" into rvc-dev am: 040bfe3721 am: 8a293f07e0 
Change-Id: I55d1f78c8a0c90a1feef840865fdc9bb686da2cf
 2020-03-20 11:15:34 +00:00
Bonian Chen
78b5db508b Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev am: 26fb6c29c1 am: 1eb4c78a0e 
Change-Id: Id6591b6f9b6cb773cef09704440df379053f520a
 2020-03-20 11:15:25 +00:00
Bonian Chen
e3d992094a Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev am: 06899ffb8e am: fc9bdd1fdf 
Change-Id: Id182022f476a09a71f819f8ef0176fd99ef3545c
 2020-03-20 11:15:19 +00:00
Junyu Lai
040bfe3721 Merge "Adjust code for API council feedback" into rvc-dev 2020-03-20 11:03:47 +00:00
Bonian Chen
26fb6c29c1 Merge "[Settings] mSubId should not be overridden in TelephonyBasePreferenceController" into rvc-dev 2020-03-20 10:52:38 +00:00
Bonian Chen
06899ffb8e Merge "[Settings] Avoid from accessing IMS with invalid subscription id" into rvc-dev 2020-03-20 10:48:03 +00:00
Bonian Chen
594c267e99 [Settings] mSubId should not be overridden in 
TelephonyBasePreferenceController

mSubId is a protected member provided by parent class.
Overriding mSubId should be avoided.

Bug: 150535296
Test: manual
Change-Id: I391b034c9badd43094ab52b8b6488bca07ef3c86
 2020-03-20 10:46:52 +00:00
TreeHugger Robot
c2e24ebb2b Merge "[Wi-Fi] Fix Wi-Fi broken tests" 2020-03-20 08:53:54 +00:00
Arc Wang
4fafe6716c [Wi-Fi] Fix Wi-Fi broken tests 
Bug: 150910070
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie9b9384610857e2999fe4642a93c2d31ce3315f3
 2020-03-20 15:41:29 +08:00
Bonian Chen
4a49f426fb [Settings] Avoid from accessing IMS with invalid subscription id 
Check subscription ID before accessing to IMS APIs

Bug: 149190278
Test: make and manual test
Change-Id: I0561529ccaf23c84d7d6dd3e268386ab82f17418
 2020-03-20 13:31:35 +08:00
Sooraj Sasindran
50021cec85 Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d am: cb5953d272 am: 46a5ddb514 
Change-Id: Ia9e327ab1eedd47004a2d15c4e7fe9703d8dfdc1
 2020-03-20 05:30:49 +00:00
Goven Liu
22d36871c0 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 am: 1db751a1d3 am: 8450e47487 
Change-Id: Ic6ccbc9086d500da823282234f2fcc845c8ff4ac
 2020-03-20 05:30:09 +00:00
Sooraj Sasindran
cb5953d272 Revert "access system resources with android.R package" am: 253ba4f3ef am: 2628af114d 
Change-Id: Ib765d1e4f0485cb3f4d42d659633e1d91c9d2735
 2020-03-20 05:09:26 +00:00
Goven Liu
1db751a1d3 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9 am: a3e9660230 
Change-Id: Ia16dae9b6da10974921566f8299eb4b85e128a1d
 2020-03-20 05:08:57 +00:00
Sooraj Sasindran
2628af114d Revert "access system resources with android.R package" am: 253ba4f3ef 
Change-Id: Idf5eee8350df4aaa7ea37f85677b315b35c56028
 2020-03-20 05:01:58 +00:00
Daniel Bright
6249dfbd9f Merge "Revert "access system resources with android.R package"" into rvc-dev 2020-03-20 04:57:43 +00:00
Goven Liu
b626a602c9 Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev 2020-03-20 04:54:46 +00:00
Joshua Duong
6178918653 Add visibility control to ADB QR code preference. 
The preference should be hidden if isAdbWifiQrSupported() is false.

Bug: 150163684
Bug: 149843499

Test: make RunSettingsRoboTests ROBOTEST_FILTER=AdbQrCodePreferenceControllerTest
Change-Id: I3e833440fb1a6f369ac97cec8db04f2b99dd4640
 2020-03-19 21:28:13 -07:00
TreeHugger Robot
72ebe55ea8 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 8fd066d5d3 am: bb219af59b am: f753a5941d 
Change-Id: Ie8f9f2d46471ea049ad2b98bafeacf6153f968a8
 2020-03-20 03:02:40 +00:00
TreeHugger Robot
8fd066d5d3 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 
Change-Id: Ice2f1aae12ae46f1448bf11b25c78008c5ab4e34
 2020-03-20 02:16:04 +00:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package" 
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
 2020-03-20 01:37:47 +00:00
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package" 
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
 2020-03-20 01:37:30 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00
govenliu
907e402cfa [Wi-Fi] Add API to handle help button click event 
Add API to launch help page when Openroaming help button is tapped.

Bug: 146669261
Test: Add openSubscriptionHelpPage_shouldCallStartActivityForResult unit test to check StartActivityForResult had been launched correctly.
Change-Id: If18248e7d985215e65dfdc5742cd9007efbbff1a
 2020-03-19 23:22:36 +00:00
Michael Groover
3c14b044ff Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: 81020f989d am: 64453c54f0 
Change-Id: I0bd0205132c4e60b3b0968d62cfc66b4412b686e
 2020-03-19 22:20:23 +00:00
Varun Anand
61d26322b3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: 5f0937286b am: acb2d24b80 
Change-Id: I9d7c382c30de485c5530960c996775010e57c361
 2020-03-19 22:05:53 +00:00
Hall Liu
900ccba596 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95 am: a81102b92c am: 30de5f4593 
Change-Id: I18ffb79438ebc5cfb22b748953501f6a72ebf107
 2020-03-19 21:54:53 +00:00
Michael Groover
81020f989d Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b 
Change-Id: I464c0b36d00f725526fad04715497330e9a557e6
 2020-03-19 21:50:35 +00:00
Varun Anand
5f0937286b Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 
Change-Id: I0058545d4d9fa0cd7d524e8790e885e59208216f
 2020-03-19 21:46:23 +00:00
Michael Groover
4605509b09 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe 
Change-Id: Iddcb73d6300a4563d6ce146c27446d88638f212b
 2020-03-19 21:37:41 +00:00
Varun Anand
38fc2238bd Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 
Change-Id: Ia42e358a40f86101ab8f104697861b325fbc3293
 2020-03-19 21:36:13 +00:00
Michael Groover
0a189b3abe Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev 2020-03-19 21:31:01 +00:00
Varun Anand
4ebfaec3a3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev 2020-03-19 21:21:22 +00:00
Hall Liu
f0f5796b95 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 
Change-Id: I9224f80e87ab21b00ce78427c093b5b686c9ddea
 2020-03-19 21:09:09 +00:00
Hall Liu
64e48c2061 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev 2020-03-19 21:06:54 +00:00
Peter Wang
1e01a47192 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: e85186f38e am: b3bf9454eb am: 0e48aeb71d 
Change-Id: Iebd334eab73b33ec6a7b504cb41b357431536722
 2020-03-19 20:49:45 +00:00
TreeHugger Robot
6651b2396d Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 am: 22aedc6715 am: 62d9ca6725 
Change-Id: Ia5fe588128da02667792537b24b6a64150c0e7ef
 2020-03-19 20:16:26 +00:00
Peter Wang
e85186f38e Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 
Change-Id: I904e10cf91836c1d25d6b318dff364185f5a796f
 2020-03-19 20:16:15 +00:00
Peter Wang
6c95bb5cf6 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev 2020-03-19 20:07:39 +00:00
TreeHugger Robot
22aedc6715 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 am: 866a77ee75 
Change-Id: I839715e256ea325108a0d0d56ac08eacb9acb1a1
 2020-03-19 19:24:49 +00:00
TreeHugger Robot
88f17b2ce9 Merge "Add Ethernet Tethering settings" into rvc-dev am: 635c0e7f78 
Change-Id: I455f43c98d738412ba87a67193189827f851dff7
 2020-03-19 19:08:47 +00:00
TreeHugger Robot
635c0e7f78 Merge "Add Ethernet Tethering settings" into rvc-dev 2020-03-19 18:54:12 +00:00