PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,055 Commits 1 Branch 0 Tags
dd1c7d0a8aedaa6edf6d52a66df3ccff06264af6
Commit Graph

55055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raff Tsai
1fdadc1125 Merge "Fix cannot see "see more" button in UI" 
am: 2dbc2db581

Change-Id: I1ad3c46aa2e79aec39725a76d3033be848f79506
 2019-12-04 20:26:34 -08:00
Treehugger Robot
2dbc2db581 Merge "Fix cannot see "see more" button in UI" 2019-12-05 04:17:42 +00:00
Raff Tsai
28a6bcc729 Fix cannot see "see more" button in UI 
Bug: 144546394
Test: Cts test
android.provider.cts.SettingsPanelTest#volumePanel_seeMoreButton_launchesIntoSettings

Change-Id: I786d62937e93abdaf96f89b03669302159d571a1
 2019-12-05 11:09:49 +08:00
atrost
edd75ce519 Add descriptions to compat changes. 
Capture the comment above a definition of a compat change and make it
the description.
Next: make sure existing changes use supported format (only /**
comments, only above the annotations), and use in developer UI.

Bug: 144927670
Test: treeHugger
Change-Id: I5f53517751762a637dc6fc0f220b83d84eb3a916
 2019-12-04 19:19:57 +00:00
Sarah Chin
bf7ee4a861 Add NGRAN 
Test: build
Bug: 143683654
Change-Id: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
Merged-In: I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c
 2019-12-04 09:16:04 -08:00
Neil Fuller
df086ecb4f Switch settings to use TimeDetector 
Switch settings to use TimeZoneDetector when setting the system time
zone rather than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests
Change-Id: I6042093294ba9690d4355bfe1c47d9f88a2b7ac6
 2019-12-04 13:43:58 +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
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
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
Xin Li
b4fe2d062d Merge Android10 QPR1 into AOSP master 
Bug: 145570283
Change-Id: I4a45c18c3ee945f3603921c60d0762e44e686688
 2019-12-02 21:25:19 -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
Neil Fuller
5ef64ad89b Merge "Switch settings to use TimeDetector" 
am: d32eee26e3

Change-Id: I1f3c05b986768be9c29043eea51143d6ab22bd12
 2019-11-28 00:54:40 -08:00
Neil Fuller
d32eee26e3 Merge "Switch settings to use TimeDetector" 2019-11-28 08:47:32 +00:00
Neil Fuller
3c794261a5 Switch settings to use TimeDetector 
Switch settings to use TimeDetector when setting the system clock rather
than using AlarmManager directly.

Bug: 140712361
Test: treehugger
Test: manual
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=TimePreferenceControllerTest
Test: make -j30 RunSettingsRoboTests ROBOTEST_FILTER=DatePreferenceControllerTest
Change-Id: I671bf0e7e7364f64f1397d524c6277591eb4e22e
Merged-In: I671bf0e7e7364f64f1397d524c6277591eb4e22e
(cherry picked from commit 9861696306)
 2019-11-27 16:36:59 +00:00
Torbjorn Eklund
4f44b44168 Consider subId when loading Wfc string resources 
Consider subId when loading string resources in screen
WifiCallingSettingsForSub and Wi-Fi Calling slice.

This ensures that correct string resources is loaded in multi sim
scenario when operators are using customized strings.

Bug: 129893058
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingPreferenceController
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiCallingSliceHelper
Change-Id: Ia5b763d4b59f7e738cb741b778bb859884a85198
 2019-11-27 14:35:07 +01:00
Bonian Chen
37e02742a4 Merge "IMS: Grey out Wifi calling option when either sub is having call." 
am: 262b4f7434

Change-Id: I59a18265dc053386854c6c4b4b30e90c287b34e8
 2019-11-26 17:46:38 -08:00
Bonian Chen
262b4f7434 Merge "IMS: Grey out Wifi calling option when either sub is having call." 2019-11-27 01:35:23 +00:00
Bonian Chen
ec4e1a14e0 Merge "[Setting] Fix merge conflict" 
am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8
 2019-11-26 02:02:03 -08:00
Bonian Chen
67805d8e5e Merge "[Setting] Fix merge conflict" 2019-11-26 08:45:05 +00:00
Raff Tsai
bfa1f2979e Merge "Prevent null point exception" 
am: 45b03edd00

Change-Id: Ifbcf83606e115cb1a759382b38949f49af4e4112
 2019-11-26 00:02:27 -08:00
Bonian Chen
dfba6f8720 [Setting] Fix merge conflict 
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
 2019-11-26 07:20:30 +00:00
Treehugger Robot
45b03edd00 Merge "Prevent null point exception" 2019-11-26 07:10:47 +00:00
Bonian Chen
1aac3bb569 Merge "[Settings] Fix test case" 
am: 9d66571966

Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f
 2019-11-25 21:43:52 -08:00
Bonian Chen
9d66571966 Merge "[Settings] Fix test case" 2019-11-26 05:32:00 +00:00
Raff Tsai
0e8a45a7f5 Prevent null point exception 
Test: Settings -> click search bar, not seeing null point exception
Change-Id: Ib9df9d97b374246fa36c79f531760b57d7c6c508
 2019-11-26 12:05:58 +08:00
Bonian Chen
6c25c29464 [Settings] Fix test case 
Change annotation library

Bug: 144664534
Test: build pass
Change-Id: Iffafc3a9a7dadc961d180c6a1ef2764c8d72eb2f
 2019-11-25 22:28:22 +08:00
Bonian Chen
d7f0fb6cc1 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 
am: 95e1c8d099

Change-Id: Ia69e14def5abf09d286d20f7922ea6900e9d61f1
 2019-11-25 05:43:18 -08:00
Pooja Jain
812f8e9065 IMS: Grey out Wifi calling option when either sub is having call. 
The WifiCallingSettingsForSub was not checking for call state reported
by telephony manager, hence, when call was on other sub, the option was not
getting greyed out.
Use the TelephonyManager API to fetch callstate.

Test: Manual

Bug: 130706399
Change-Id: Ib4b0e1191c83e23377ccf8ed013252728ef9dd95
 2019-11-25 12:10:03 +05:30
Bonian Chen
95e1c8d099 Merge "[Settings] Fix conflict of AOSP merge on wifi call" 2019-11-25 03:07:16 +00:00
Bonian Chen
cacf047daa [Settings] Fix conflict of AOSP merge on wifi call 
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e
 2019-11-22 20:38:13 +00:00
Andrei-Valentin Onea
5f2ee93a4b Merge "Add compatibility change preference" 
am: 0e7b8f7a93

Change-Id: Ied50da0e1cdda7c390603f184ae614dd8584025b
 2019-11-22 06:06:39 -08:00
Andrei-Valentin Onea
0e7b8f7a93 Merge "Add compatibility change preference" 2019-11-22 13:02:45 +00:00
Bonian Chen
88594b8bf7 [automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" 
am: 56385ed9f8 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c87 is in history

Change-Id: Ifaf20e18a9c5e9e8a890b4d3ffa5040c624dc0dd
 2019-11-22 01:13:28 -08:00
Bonian Chen
56385ed9f8 Merge "[Settings] Fix conflict of AOSP merge" 2019-11-22 09:05:29 +00:00
Bonian Chen
821a1259e7 [Settings] Fix conflict of AOSP merge 
Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I0e8c9b060f23547cec541819e657fc5560d6312c
Merged-In: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
 2019-11-22 02:36:11 +00:00
Andrei Onea
486fd49e87 Add compatibility change preference 
Add UI for modifying the compatibility change overrides per-app.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 138280620
Change-Id: I07c7602e7a439e47b0b1fa59b047231afbbc0ab6
 2019-11-21 11:48:07 +00:00
Bonian Chen
635c2fa095 Merge "[Settings] Fix robotest build breakage" 
am: 6c9b9f41d6

Change-Id: I0b52f783c5dd46a06ebfb0a51650666c0e52b961
 2019-11-20 19:11:18 -08:00
Bonian Chen
6c9b9f41d6 Merge "[Settings] Fix robotest build breakage" 2019-11-21 02:56:12 +00:00
James Mattis
1f3415f36e Merge "Swap param order in registerSoftApCallback" 
am: 76632c01fd

Change-Id: Id33581fd71070e23a561ca34e76f0623d66e2852
 2019-11-20 10:32:44 -08:00
James Mattis
76632c01fd Merge "Swap param order in registerSoftApCallback" 2019-11-20 18:16:53 +00:00
Bonian Chen
4a1dbccac6 [Settings] Fix robotest build breakage 
Add annotation library into test build

Bug: 144810473
Test: build pass
Change-Id: Idb4e056fb73a349ac268e5d2292a31fe7d9a6642
 2019-11-20 23:05:55 +08:00
James Mattis
def3e9f734 Swap param order in registerSoftApCallback 
Moving executor to be the first argument in registerSoftApCallback.

Bug: 144379300
Test: Manually on pixel 3

Change-Id: I5563c1059cc04014a0fd909e2508f7bf497d708e
Merged-In: I5563c1059cc04014a0fd909e2508f7bf497d708e
 2019-11-18 13:16:34 -08:00
James Mattis
ff7d499b18 Merge "SoftApCallback using executor vs handler" 
am: 60bd816476

Change-Id: Ie1fa6d76883ed5ee1a9e4390637a8f514e4cdbdf
 2019-11-15 15:35:43 -08:00
James Mattis
60bd816476 Merge "SoftApCallback using executor vs handler" 2019-11-15 23:17:54 +00:00
Hunter Knepshield
418ef9973e Merge "Synced the code from master branch" 
am: 64efbe1240

Change-Id: I042c2bb85876bf67acc98113f01186e831adeae5
 2019-11-15 10:45:58 -08:00
Hunter Knepshield
64efbe1240 Merge "Synced the code from master branch" 2019-11-15 18:19:06 +00:00
Sunny Shao
f3865e9264 Synced the code from master branch 
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
 2019-11-14 21:57:12 +08:00