PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,228 Commits 1 Branch 0 Tags
e24a23f9ab5de449f66d85f7816f871f3a2ffab5
Commit Graph

9218 Commits

Author SHA1 Message Date
Treehugger Robot
8889d6012e Merge "Show footer to notify user no 5G in DSDS mode." 2020-04-08 19:33:21 +00:00
Bonian Chen
b3e2be170f Show footer to notify user no 5G in DSDS mode. 
(Cherry pick part of I5df95528aae12b43a15389b8048f14d9508272f3)

Bug: 151657272
Test: build pass
Change-Id: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
Merged-In: Iedfa26b320480cf4b606293c39a3ac94da1ad1fa
 2020-04-08 17:55:25 +00:00
Bonian Chen
df97bbbdd5 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b am: 733530e086 
Change-Id: I5a1a3d423103971c0978e9e7dbdad216b398a159
 2020-04-08 07:11:00 +00:00
Bonian Chen
733530e086 Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" am: fe22ecad9b 
Change-Id: If4f0e4b0c0d44ee6b7387a4a94c44d949706c557
 2020-04-08 06:56:14 +00:00
Bonian Chen
fe22ecad9b Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" 2020-04-08 06:40:10 +00:00
Bonian Chen
d9957643d9 [Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API 
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.

Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
Merged-In: I350604a64a56151195f52d38bd258e34c76e40c5
Change-Id: I4fc89e91381b1562ee7e2f48cfc159949c81a414
 2020-04-08 06:38:10 +00:00
Xin Li
ad360f14a6 Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master" 2020-04-08 06:26:03 +00:00
Bonian Chen
9d1b047e4c Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b am: c034169ccd 
Change-Id: I928f1223c983a6ffcfae75cdf193779a7e688a60
 2020-04-08 05:21:31 +00:00
Bonian Chen
c034169ccd Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b 
Change-Id: I36f17b8206bd397306dca9d37e2bd3cf48700321
 2020-04-08 05:08:49 +00:00
Bonian Chen
4e8786c09b Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." 2020-04-08 04:57:12 +00:00
Bonian Chen
f479860538 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c am: b35536dda8 
Change-Id: Ibe3343a47e156e632b4271bf50bd5773c7c3cbf9
 2020-04-08 03:54:35 +00:00
Bonian Chen
b35536dda8 Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c 
Change-Id: I3c8fb5dc82165f42e6bee5742cddc48d934684ed
 2020-04-08 03:41:01 +00:00
Xin Li
9dc49223ab DO NOT MERGE - Merge QQ2A.200405.005 into master 
Bug: 150877681
Merged-In: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Change-Id: Ia97ace340fa53229dd3ebbe0caa09ab996755b5a
 2020-04-07 11:29:38 -07:00
Bonian Chen
5a31b13971 [Settings] "Data during calls" in DDS SUB is still in advanced option. 
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Merged-In: I0121f06efb5257dccc05ad06b93a9db263f012b5
Change-Id: I6c8802aeb7b4f4850cb143e70a9e06de9fd93902
 2020-04-07 20:11:09 +08:00
Bonian Chen
5ab1c6cb61 [Settings] Changes for supporting replacing ImsManager 
Wrap IMS related APIs in order to support replacing ImsManager.

Bug: 140542283
Test: build pass
Merged-In: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
Change-Id: Ibc8c1c36fe031a3d845b99f878ef45ce5db7de28
 2020-04-06 21:43:05 +08:00
Sarah Chin
ba99375f1b Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 
Change-Id: I65d13bbddb91cec3b67580ae1d8f9f9889893de3
 2020-03-31 23:27:10 +00:00
Sarah Chin
c03048cd27 Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a 
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
 2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a Merge "Rename calls to isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Brad Ebinger
6e791da6cd Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 
Change-Id: I135326905313c1863e8e7945d8af19b4f4964e26
 2020-03-31 20:20:51 +00:00
Brad Ebinger
84fc8390be Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 
Change-Id: I847569cc59b21278575f0b43b2117f83cee569a1
 2020-03-31 20:20:49 +00:00
Brad Ebinger
8bc35321d8 Merge changes I06df2928,I70821964 am: 24ddbf5e8c 
Change-Id: I3aeb0e140fcb3a6c28e1880a6784e7800c368f47
 2020-03-31 20:10:07 +00:00
Brad Ebinger
da1335a9f4 Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a 
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
 2020-03-31 20:10:05 +00:00
Brad Ebinger
cacc9dd04b Fixes ContactDiscoveryDialogFragmentTest 
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Fixes: 150908269
Fixes: 151172952
Merged-In: I06df2928116b33fec39aade733401d60e6cde1c1
Change-Id: I06df2928116b33fec39aade733401d60e6cde1c1
 2020-03-25 16:23:45 +00:00
Brad Ebinger
f469cac10a Add new DialogFragment and Controller for capability discovery opt-in 
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Bug: 111305845
Test: manual
Merged-In: I70821964bc618c3c389c9039cd7f5028e34c7ebb
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
 2020-03-25 16:19:54 +00:00
Raff Tsai
9d59802141 Merge "Modify close app function." am: ce1f51128b am: 579878afcf 
Change-Id: I20818d1033455533f14e6c9b5c2ebfb1d8f4526a
 2020-03-23 11:09:29 +00:00
Raff Tsai
579878afcf Merge "Modify close app function." am: ce1f51128b 
Change-Id: I80e83ae16c2a2f931604e864fb79ee1d02db6a0e
 2020-03-23 10:53:44 +00:00
youtengliang
aa4f582931 Modify close app function. 
Test: atest com.android.settings.tests.perf
Change-Id: Ia504dd1185de1d33a21fec344871d4b0fabae953
 2020-03-23 09:29:28 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
TreeHugger Robot
e9098ad882 Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d 
Change-Id: I9d93999096561ae6f3241738262110325c5f64fb
 2020-03-20 03:19:38 +00:00
Anna Trostanetski
cf2d2ef9f0 Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab 
Change-Id: I11a7375ff99db50f3b2be01e9cc40bc9697b78e0
 2020-03-19 17:51:55 +00:00
Xin Li
0cad441364 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master 
Bug: 151763422
Change-Id: I2f38724f862817185ae93dd79736791540251a60
 2020-03-19 10:10:41 -07:00
atrost
77e4f7b3bb Show only listUIChanges instead of all 
Use the new method that filters out changes that shouldn't be in the
developer UI.

Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Merged-In: I5b461b33484a38d0c6a5b7bf7e928231dd662668
 2020-03-19 16:06:28 +00:00
Treehugger Robot
7b4c559f32 Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 
Change-Id: I33877d685c9da74b19570c00d1082d1190ef524d
 2020-03-19 05:43:13 +00:00
Betty Chang
e22ef3bd14 Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 
Change-Id: I7ecbe73fceb320d9fe1b13a627c46507a0964231
 2020-03-19 04:42:54 +00:00
SongFerngWang
6c9ce4d892 Fix sim pin lock preference disappear in dual sim. 
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
Merged-In: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
 2020-03-19 12:13:37 +08:00
changbetty
e9f857621f [Mainline] Use public method in SubscriptionManager for mainline 
- getActiveSubscriptionIdList
   To use getActiveSubscriptionInfoList to get subscription Id list
 - getActiveSubscriptionInfoList(Z)
   To use getActiveSubscriptionInfoList() instead

Bug: 144478274
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
       make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest

Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
Merged-In: I4d6113561906af5c9e4ac7737aefac17c926059a
 2020-03-18 10:33:39 +00:00
Automerger Merge Worker
327db8c033 Merge "Settings performance testing" am: 4186be0f29 am: 0c0a52cc12 
Change-Id: I0099a4bda75f8acc86e09d142a1bdcc29bbc9684
 2020-03-13 13:57:05 +00:00
Raff Tsai
4186be0f29 Merge "Settings performance testing" 2020-03-13 13:22:57 +00:00
youtengliang
ef861b0e3e Settings performance testing 
Test: atest com.android.settings.tests.perf LaunchSettingsTest

Change-Id: I32a077b22bc4cd36c7aab32dd22dede87b406641
 2020-03-13 13:22:38 +00:00
Automerger Merge Worker
7bb65a19dc Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5abf am: 10ff4f4ab6 
Change-Id: I380cb41a50e1dfc1edf9aca30c6dac14e33740d5
 2020-03-13 12:24:48 +00:00
Automerger Merge Worker
fa889d4fec Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd94 am: 7ecae6dd06 
Change-Id: I7a64297cc60f20d560e811636c4d2678366282c1
 2020-03-13 12:24:42 +00:00
Bonian Chen
52dd9f5abf Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" 2020-03-13 12:05:36 +00:00
Bonian Chen
0972a6dd94 Merge "[Settings] Refactor DisabledSubscriptionController" 2020-03-13 11:52:53 +00:00
Automerger Merge Worker
e628466fc2 Merge "[Settings] Refactor CarrierPreferenceController" am: 985352d172 am: a0d1887a98 
Change-Id: I449647f069d2e356fd6fa7ed06e655e2c0ad9eb9
 2020-03-13 10:48:10 +00:00
Automerger Merge Worker
0587fe1ced Merge "[Settings] Refactor Telephony PreferenceController" am: 1b00c00f79 am: 6865bece3c 
Change-Id: I9f0f6f0f404b35f05ac1b101b7a3e71bae6517c0
 2020-03-13 10:48:05 +00:00
Bonian Chen
985352d172 Merge "[Settings] Refactor CarrierPreferenceController" 2020-03-13 10:12:29 +00:00
Bonian Chen
1b00c00f79 Merge "[Settings] Refactor Telephony PreferenceController" 2020-03-13 10:11:54 +00:00
Bonian Chen
0971feaeda [Settings] Code Refactor of MobileNetworkPreferenceController 
Code Refactor of MobileNetworkPreferenceController

Bug: 150567855
Test: make
Change-Id: If5de2d0841e2f8705d2e202b6e6a7e53dc1a4897
 2020-03-13 15:58:09 +08:00
Bonian Chen
332de69f8e [Settings] Refactor CarrierPreferenceController 
Refactor CarrierPreferenceController

Bug: 150352656
Test: make
Change-Id: I8b125eb501cdbf63cbfa84d72d78e44a655bf9a5
 2020-03-12 20:53:10 +08:00
Bonian Chen
b7891e879f [Settings] Refactor Telephony PreferenceController 
Refactor TelephonyBasePreferenceController and TelephonyTogglePreferenceController

Bug: 150352656
Test: make
Change-Id: I3d52054fd9fbc5597db6266686d155a12d5a88d6
 2020-03-12 20:43:54 +08:00