Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,253 Commits 1 Branch 0 Tags
f044ae9bcee7e36c49cccb9dcf28dcd4f11d58f2
Commit Graph

31590 Commits

Author SHA1 Message Date
TreeHugger Robot
f044ae9bce Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: b4b63b60b9 am: 83646cd7fc 
Change-Id: If1cb9c424658b44ad5f3ddf2e56730973de3ee12
 2020-04-13 03:58:44 +00:00
George Chang
dd4ef7e5bd Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a am: 270ea3400b am: e7b5086dd1 
Change-Id: Ia66e6d95715674c409dd17b583a20b957e58ce8d
 2020-04-13 03:58:19 +00:00
TreeHugger Robot
b4b63b60b9 Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf 
Change-Id: I93601a9885636fd81759d629203e26fd43dcbf73
 2020-04-13 03:18:42 +00:00
George Chang
270ea3400b Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev am: 0181643bb7 am: 5a6d05885a 
Change-Id: Iae7ec5f9d2cb9a59ea2dbaf65dcb3bcc8bbbb7aa
 2020-04-13 03:18:31 +00:00
TreeHugger Robot
c56bcb5e7f Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev 2020-04-13 02:45:04 +00:00
George Chang
0181643bb7 Merge "[NFC] Disable contactless payments when no payment application installed" into rvc-dev 2020-04-13 02:43:35 +00:00
George Chang
28895f2822 [NFC] Disable contactless payments when no payment application installed 
Bug: 153821082
Bug: 149270345
Test: Check settings
Change-Id: I5162ecb07c26a33427305b6cf65829b2c61ad317
 2020-04-13 01:53:23 +00:00
TreeHugger Robot
d445934279 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 am: d2b330f5ef am: 2e7b71dce7 
Change-Id: I7fe65de1a8576603a1b43123d7544872cfa66c7b
 2020-04-13 01:42:25 +00:00
TreeHugger Robot
d2b330f5ef Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev am: 545f08e872 am: 35d8c0bdb3 
Change-Id: Ie00b07ebe6e474e5371bf12ed851e91be116a4a6
 2020-04-13 01:11:27 +00:00
TreeHugger Robot
545f08e872 Merge "Hide Bluetooth, Reset, Accessibility Settings in ARC" into rvc-dev 2020-04-13 00:28:11 +00:00
Robert Luo
afb01f12cd Fix NFC UI is not available when switching to 2nd user 
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
 2020-04-12 15:27:18 +08:00
Joshua Duong
2ae802aa4a Merge "[adbwifi] Add qstile for wireless debugging." into rvc-dev am: 99eeb00360 
Change-Id: I65671fb805807b23762954038061d7baedf8aac2
 2020-04-10 22:12:20 +00:00
Joshua Duong
0f3eba36f2 [adbwifi] Add qstile for wireless debugging. 
Bug: 153275926

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingTest
Change-Id: I6b381a7e29beec5c9c345b374e127caabdb674db
(cherry picked from commit 0c23d39f94)
Exempt-From-Owner-Approval: cherry-pick
 2020-04-10 19:12:40 +00:00
TreeHugger Robot
30cd86012a Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe am: 70f0c6a53f am: 8a009ac35d 
Change-Id: If31a5ac9df256919696df72de5452e68b914deb3
 2020-04-10 14:06:12 +00:00
Bonian Chen
bafd78f16b Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a am: 5a45c3ff77 am: cddf1f341b 
Change-Id: I4bfced32a89efbd085c55c5cdb139c2d53838f5b
 2020-04-10 14:05:43 +00:00
TreeHugger Robot
70f0c6a53f Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 am: 976b3690fe 
Change-Id: If078432fd8e8ab16653aedf000f6da85b9a7a327
 2020-04-10 13:19:21 +00:00
Bonian Chen
5a45c3ff77 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab am: b72aa1c03a 
Change-Id: I0193370f5b63f92abe6490839a571f0c6c6df422
 2020-04-10 13:19:03 +00:00
TreeHugger Robot
dde9ab5b62 Merge "Support click metrics logs in several pages" into rvc-dev am: afaf654a77 
Change-Id: I2cc663ea9aec69848bc96d6dc25e1895984b9731
 2020-04-10 12:57:10 +00:00
Bonian Chen
8a5272b307 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev am: e18904daab 
Change-Id: Ib2d9ecedaa764c9ea884f19f2a1db45cf62f9613
 2020-04-10 12:56:32 +00:00
TreeHugger Robot
afaf654a77 Merge "Support click metrics logs in several pages" into rvc-dev 2020-04-10 12:55:10 +00:00
Bonian Chen
a8f76bcf8a Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 am: 1031a3156f am: 570eb70eb1 
Change-Id: I2661f8e0d74055fdccfff915fe9deddafb5fdd7f
 2020-04-10 12:42:12 +00:00
Bonian Chen
e18904daab Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev 2020-04-10 12:37:42 +00:00
Bonian Chen
1031a3156f Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c am: 369594d796 
Change-Id: Ibd2e4ac878c48502f11a90faaad9a800b0ef3551
 2020-04-10 12:12:52 +00:00
Bonian Chen
dc6d9e53d1 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: 866fa1061c 
Change-Id: I837ddd16902ad159d5f791c316ba4f962f754640
 2020-04-10 11:51:45 +00:00
Bonian Chen
866fa1061c Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev 2020-04-10 11:30:42 +00:00
Bonian Chen
cad93df0a4 [Settings] Avoid rename inactive subscription from NullPointerException 
1. Init instance before accessing it
2. Re-enable test case

Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
(cherry picked from commit 1b71b5e601)
 2020-04-10 18:05:17 +08:00
TreeHugger Robot
a82b875bb8 Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec am: f702bb94d0 am: adde699c99 am: ff26d4501e 
Change-Id: I9fbe5758898d274f2f0a470b1c294f7646dd0dce
 2020-04-10 09:13:45 +00:00
Arc Wang
dc43f1950a Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7 am: 6253abc2ab am: 98d4d8a0d0 am: a8cc148791 
Change-Id: Ibc8c7b7e54df51dc33558803e807742526a7b8f1
 2020-04-10 09:12:48 +00:00
TreeHugger Robot
299d1afb5b Merge "[adbwifi] Add qstile for wireless debugging." 2020-04-10 09:03:01 +00:00
TreeHugger Robot
adde699c99 Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec am: f702bb94d0 
Change-Id: I003ad64464a044d1fbc39431db81a4e32bcaeb37
 2020-04-10 08:29:28 +00:00
Arc Wang
98d4d8a0d0 Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7 am: 6253abc2ab 
Change-Id: I5d49798c339ec62bc6b22e3a552887b1d7f38356
 2020-04-10 08:29:18 +00:00
Bonian Chen
0304e5f90c [Settings] Avoid from crash when pull out SIM 
Avoid from crash when pull out SIM under SimStatusDialogController.

Bug: 153512823
Test: manual
Change-Id: I3869326bdfb65368827f25469ae83539a68e171f
 2020-04-10 16:28:46 +08:00
TreeHugger Robot
c865eb04bc Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec 
Change-Id: I03b72c6027dcfe40e60363d17e7ccbf5e6f7f58a
 2020-04-10 08:10:50 +00:00
Arc Wang
c41420bd4e Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev am: 57ff6599e7 
Change-Id: I5409c87391c8ec39bcdb1d9dcdf608b898d99cdf
 2020-04-10 08:10:45 +00:00
TreeHugger Robot
6e50dfc6ec Merge "[Settings] Add more owner" into rvc-dev 2020-04-10 08:08:30 +00:00
Arc Wang
57ff6599e7 Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev 2020-04-10 07:50:49 +00:00
Menghan Li
a530dc4621 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev am: 417011c6f7 am: 698b8f1f87 am: 534d5ca2b6 am: 0ed4426b51 
Change-Id: I54e100b80baf1ed15dc132dd8ebecab545be2d85
 2020-04-10 07:49:36 +00:00
Hiroki Sato
0e75d475ec Hide Bluetooth, Reset, Accessibility Settings in ARC 
This is an upstreaming change of http://ag/8541963 and
http://ag/10296201 to hide some items from settings search.

This CL also adds javadoc to some settings classes to fix pre-upload
warnings.

Bug: 153704887
Test: Manual. In ARC build, "bluetooth" and "accessibility" no longer shows related settings.
Change-Id: Ic3e9217944251adbea1bdd67baf66d3a9e89583a
 2020-04-10 16:00:57 +09:00
Menghan Li
698b8f1f87 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev am: 417011c6f7 
Change-Id: I7c9d24b0d4377fac0e622bec05c1107db9050c9a
 2020-04-10 06:33:20 +00:00
Menghan Li
417011c6f7 Merge "Sets the scroll indicators for edit shortcut dialog." into rvc-dev 2020-04-10 05:21:54 +00:00
Arc Wang
d004dfc4b3 [Wi-Fi] Fix Hidden network option scrolls to bottom problem 
Should not scroll to bottom since Hidden network option
is not at the bottom most.

Bug: 148036155
Test: manual
      Wi-Fi Setings -> Add network -> Advanced options ->
      click 'Hidden network' Yes -> should not scroll to bottom.
Change-Id: I6511f75441ebad62e2c28df76a39d702d78898a6
 2020-04-10 13:19:30 +08:00
Bonian Chen
ce92b0efb7 [Settings] Add more owner 
Add more owner for code review.

Bug: 0
Test: none
Change-Id: Idf49638e4599b95fe39fe127e5b965cf724f5d7c
 2020-04-10 13:13:08 +08:00
Joshua Duong
0c23d39f94 [adbwifi] Add qstile for wireless debugging. 
Bug: 153275926

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingTest
Change-Id: I6b381a7e29beec5c9c345b374e127caabdb674db
 2020-04-09 22:06:31 -07:00
Calvin Pan
6168c27d8e Merge "Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode" into rvc-dev am: 4e2e7bb734 am: 2b6e636673 am: ff3b20f5eb am: 04b6333a8f 
Change-Id: Id95f086d209461d07a37e9b7a4cd2324517a4ddc
 2020-04-10 04:16:22 +00:00
Arc Wang
a6e271cbe4 Merge "[A11Y][Wi-Fi] Prevent data usage header spinner speak at onResume" into rvc-dev am: 341a7971f0 am: 4f70655963 am: 99bb9f52e4 am: b549a84de9 
Change-Id: I5c8df13cd46fd1aa4410b2d9fdf98aa6523833e9
 2020-04-10 04:16:08 +00:00
Arc Wang
44e0e38a64 Merge "[A11Y][Wi-Fi] Fix multiple Spinner selected speak out at once." into rvc-dev am: 0713c43bbb am: 873d9e019d am: 57c09cbe17 am: b68ed3bfa3 
Change-Id: I892aca783218d8c487de239d43747d8bc061b8a4
 2020-04-10 04:15:25 +00:00
Calvin Pan
ff3b20f5eb Merge "Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode" into rvc-dev am: 4e2e7bb734 am: 2b6e636673 
Change-Id: Ie0c0d2f2e916108404b3762bea984f1a4bd9a7dd
 2020-04-10 03:24:40 +00:00
Arc Wang
99bb9f52e4 Merge "[A11Y][Wi-Fi] Prevent data usage header spinner speak at onResume" into rvc-dev am: 341a7971f0 am: 4f70655963 
Change-Id: Ie78a41681c7809322328cac751b3d1c35299008d
 2020-04-10 03:24:34 +00:00
Arc Wang
57c09cbe17 Merge "[A11Y][Wi-Fi] Fix multiple Spinner selected speak out at once." into rvc-dev am: 0713c43bbb am: 873d9e019d 
Change-Id: Icd037bc011db5defa323d8f2a177530864f8b687
 2020-04-10 03:23:47 +00:00
Calvin Pan
f0a0d6e835 Merge "Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode" into rvc-dev am: 4e2e7bb734 
Change-Id: I65e6e31378c972801f1b217c20c7d19c237885a5
 2020-04-10 03:02:07 +00:00