Commit Graph

57228 Commits

Author SHA1 Message Date
Malcolm Chen
e5dcd02f4c Add disable pSIM option in Settings
As we start disabling pSIM option in R, we check that if the feature is
supported, add the "Use SIM" toggle back to pSIM page.

Bug: 141018421
Test: manual test
Change-Id: I1af497ce5ede93f823825718b8136ff8ae0ab49c
2019-12-06 13:20:06 -08:00
Automerger Merge Worker
131287c626 Merge "[Settings] Enable support on testing" am: 84a2951a33 am: fd3557954f
Change-Id: I943298e3312b800c019b2f98baf630dd45796e37
2019-12-04 17:26:19 +00:00
Sarah Chin
6c515c313c Merge "Add NGRAN" 2019-12-04 17:10:03 +00:00
Bonian Chen
fd3557954f Merge "[Settings] Enable support on testing" am: 84a2951a33
am: 08dcb51c6c

Change-Id: I07d2017ef71d2ce17d4a414d26efff9894d93d63
2019-12-04 09:08:24 -08:00
Automerger Merge Worker
0cd9e22e6b Merge "Merge "Merge Android10 QPR1 into AOSP master" am: bd2174cda1 am: 944b8b330f" 2019-12-04 17:01:12 +00:00
Alex Johnston
dd5467b13b Merge "Replace setAutoTimeRequired and getAutoTimeRequired with setAutoTime and getAutoTime" 2019-12-04 16:59:19 +00:00
Automerger Merge Worker
0e4c11e416 Merge "Merge Android10 QPR1 into AOSP master" am: bd2174cda1 am: 944b8b330f
Change-Id: I8cd38765099d4e81689293ab48975e0be8f6ac3e
2019-12-04 16:57:42 +00:00
Xin Li
944b8b330f Merge "Merge Android10 QPR1 into AOSP master" am: bd2174cda1
am: f9b5a6bd07

Change-Id: I2e5b8ed863bf41ab88146acd780f95ba99aac271
2019-12-04 08:13:43 -08:00
Bernardo Rufino
0888032b1c Merge "Add activity for MANAGE_APP_OVERLAY_PERMISSION intent in Settings" 2019-12-04 10:42:36 +00:00
TreeHugger Robot
74e60b1010 Merge "Fix videoPreference is broken when switch to multiple window" 2019-12-04 09:37:25 +00:00
tim peng
2e308853c2 Merge "Add new HD audio preference controller for Bluetooth developer option" 2019-12-04 06:30:35 +00:00
timhypeng
bea3a6e6c8 Add new HD audio preference controller for Bluetooth developer option
- move HD audio switch from codec to upper layer

Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: Ic9a3aa9666d2e105c762fec818c9a47383a6ecd2
2019-12-04 13:04:12 +08:00
TreeHugger Robot
60b7c23583 Merge "Navigate to personal/work tab based on intent extra" 2019-12-04 04:48:09 +00:00
Bonian Chen
08dcb51c6c Merge "[Settings] Enable support on testing"
am: 84a2951a33

Change-Id: Idcd4d1013ef5c0e8581f94d40ac1770dc26b38fc
2019-12-03 20:34:29 -08:00
Bonian Chen
84a2951a33 Merge "[Settings] Enable support on testing" 2019-12-04 04:32:58 +00:00
Raff Tsai
5314f2a51c Fix videoPreference is broken when switch to multiple window
Fixes: 117802997
Test: robolectric, switch between multiple window and single window.
The video should keep displaying.

Change-Id: I97b6a4516b2591b80d9a046809ce4090fb02c80f
2019-12-04 12:15:43 +08:00
Raff Tsai
910ea66615 Navigate to personal/work tab based on intent extra
Bug: 141601408
Test: Settings->Storage, click work tab, click Other apps. It should
navigate to Apps storage page and focus on WORK tab.
Change-Id: Ida91b279e771a2c7c960ce83b8e13310c87112e8
2019-12-04 11:42:23 +08:00
Ilya Matyukhin
e17caeea3f Fix "Skip lock screen" not working for secondary user
Bug: 140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
2019-12-04 00:35:27 +00:00
Sarah Chin
721084c310 Add NGRAN
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
2019-12-04 00:15:49 +00:00
Xin Li
f9b5a6bd07 Merge "Merge Android10 QPR1 into AOSP master"
am: bd2174cda1

Change-Id: Ia9a27e2d5b245f8e3b52b86e0a155fc40383c42e
2019-12-03 16:13:50 -08:00
Treehugger Robot
bd2174cda1 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:14:56 +00:00
Quang Luong
810f7861f0 Merge "Use WifiPickerTracker to get connected WifiEntry" 2019-12-03 20:03:10 +00:00
Automerger Merge Worker
833c578b01 Battery saver mode should disable dark mode modification am: 5fb68ae95d
Change-Id: I9b4b1dace76a6194fafe27e624465c3c05823bb1
2019-12-03 19:34:32 +00:00
Jay Aliomer
5fb68ae95d Battery saver mode should disable dark mode modification
am: f4bc80c45c

Change-Id: Iff4cb52ba46e20bd012f95e9d29917f7952b4259
2019-12-03 09:47:41 -08:00
TreeHugger Robot
cecaa52ed9 Merge "Support installation of the new app source certificate" 2019-12-03 17:37:11 +00:00
Bonian Chen
5cf137e0bb [Settings] Enable support on testing
1. Support ActivityScenario
2. Support add Service through ShadowServiceManager

Bug: 140542283
Test: build pass
Change-Id: Ib1066394114fb6077e1fa82872f029e6ee2b5da9
2019-12-03 20:06:59 +08:00
tim peng
cef4313ea0 Merge "Add base dialog preference controller for new Bluetooth developer option" 2019-12-03 07:12:17 +00:00
tim peng
1082bca0ee Merge "Add base preference controller for new Bluetooth developer option" 2019-12-03 07:12:17 +00:00
tim peng
2e092f5f83 Merge "Add base preference for new Bluetooth developer option" 2019-12-03 07:11:59 +00:00
TreeHugger Robot
feb51e20e6 Merge "Remove framelayout to make focus don't have duplicate action" 2019-12-03 05:46:38 +00:00
Xin Li
b4fe2d062d Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688
2019-12-02 21:25:19 -08:00
hughchen
23d04125b5 Remove framelayout to make focus don't have duplicate action
Fixes: 131128155
Test: Manual
Change-Id: Ifb96698007a2bfafb545dbc04f61343160a41ef7
2019-12-03 11:52:50 +08:00
timhypeng
78b0edfe3c Add base dialog preference controller for new Bluetooth developer option
Bug: 142227996
Test: manual
Change-Id: I15335d9c783b5ddba1b93322449f345f450d587f
2019-12-03 09:35:53 +08:00
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00:00
Abhijeet Kaur
af95719337 Merge "Make Settings UI fuse flag "settings_fuse" persistent" 2019-12-02 15:48:28 +00:00
TreeHugger Robot
7e117fba33 Merge "Reorganize notification Settings classes" 2019-12-02 13:54:05 +00:00
TreeHugger Robot
79efb45f0f Merge "Adjust preferene to align the lastest mock" 2019-12-02 10:26:09 +00:00
Raff Tsai
c6f4ff5486 Change icon
Test: rebuild
Fixes: 145242321
Screenshot: https://screenshot.googleplex.com/zLg7iWd0s66
Change-Id: I0425a44fd10f01d657c91b8633e415b0c19817f0
2019-12-02 08:53:57 +00:00
TreeHugger Robot
09abaa93dd Merge "Hide PIP related preference when device didn't support this feature" 2019-12-02 08:01:28 +00:00
Raff Tsai
91aa4b853a Adjust preferene to align the lastest mock
- Because removeAll in updateState will cause preference list janking,
move updateState code to displayPreference.

Bug: 141601408
Fixes: 145369584
Test: manual and robolectric
Change-Id: Ic6ffeedfdd7a64671e497a61894d7c0d443750ef
2019-12-02 15:13:50 +08:00
Edgar Wang
334c5b36ad Hide PIP related preference when device didn't support this feature
Fixes: 79945310
Test: atest & manual
Change-Id: I24b9de06ec94a008656cbbc016a50a4e217fece1
2019-12-02 15:01:32 +08:00
timhypeng
54d06d368d Add base preference controller for new Bluetooth developer option
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I9d10019228bc575f4ac38494e4dd27d672d5da6d
2019-12-02 14:45:42 +08:00
Raff Tsai
ed1b808474 Fix testcase error
- ignore testcase in MobileNetworkActivityTest
- To avoid null pointer access in LocationForWorkPreferenceController,
move mUserManager initialization in constructor

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.search"
Change-Id: Icf6c36ecef22149def6d5924741a798e8f506033
2019-12-02 12:11:29 +08:00
TreeHugger Robot
0a2a6cfef7 Merge "Add page creation latency for updatePreferenceStates" 2019-12-02 02:44:00 +00:00
Goven Liu
df1118d61c Merge "[Wi-Fi] Add one network request case for adding Wi-Fi for apps feature." 2019-11-29 03:28:05 +00:00
Bonian Chen
9b26611ce1 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784 am: 944689abd6
am: 6c1861b3c0

Change-Id: I3d8c02c344d0aa70952dca9aac6597ca6b36a4db
2019-11-28 07:30:09 -08:00
Bonian Chen
6c1861b3c0 Merge "Consider subId when loading Wfc string resources" am: 9c2c1b4784
am: 944689abd6

Change-Id: I6bfa2099cdb382109c90f0c3b9ea76a2a7df4d19
2019-11-28 07:28:07 -08:00
Bonian Chen
944689abd6 Merge "Consider subId when loading Wfc string resources"
am: 9c2c1b4784

Change-Id: Ib680198aff74daa31d5ca0413ca3dd869b3126af
2019-11-28 07:26:07 -08:00
Bonian Chen
9c2c1b4784 Merge "Consider subId when loading Wfc string resources" 2019-11-28 15:22:21 +00:00
TreeHugger Robot
702cc1d223 Merge "Fix bottom zone is transparent in add network page" 2019-11-28 11:45:23 +00:00