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

8207 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Bonian Chen
29c1be284b [Settings] Refactor DisabledSubscriptionController 
Refactor DisabledSubscriptionController

Bug: 150352656
Test: make
Change-Id: I6d31247d77c8fb515b9ba1b1ead33102f0e9e12f
 2020-03-12 20:17:17 +08:00
Automerger Merge Worker
31f9002e3b Merge "[Settings] Code refactor" am: a7a9863a52 am: a99bfeadf9 
Change-Id: I16b8f6d6e48c7f1f8f6ef6e76b6eaf73269b2da0
 2020-03-12 11:31:43 +00:00
Bonian Chen
bfc8714e1f [Settings] Code refactor 
Code refactor.

Bug: 150352656
Test: make
Change-Id: I9efd75849ff6972ebddbba767868ad0d0ea0ffda
 2020-03-12 16:31:06 +08:00
Automerger Merge Worker
586b2786ac Merge "Fix PlatformCompatDashboardTest." am: 805f137935 am: 976f7bfe78 
Change-Id: I800672519f7dd70b20645d3c9348f32e8d5ce648
 2020-03-09 11:17:46 +00:00
Anna Trostanetski
805f137935 Merge "Fix PlatformCompatDashboardTest." 2020-03-09 10:53:02 +00:00
Automerger Merge Worker
3af57b3c28 [Wi-Fi] Ignore incorrect user certificates am: 9e46a0bc93 
Change-Id: If45cb2b3e0c37b16047ff0c393da1cbfb379b091
 2020-03-04 02:32:45 +00:00
Sarah Chin
83893a3ffd Rename calls to isGlobalModeEnabled 
Test: atest FrameworksTelephonyTests
Bug: 148603998
Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
Merged-In: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
 2020-03-03 14:59:27 -08:00
atrost
62c470475f Fix PlatformCompatDashboardTest. 
CompatibilityChangeInfo constructor has a new parameter.
The logging only is not currently reflected in the dashboard - it will be grayed out as it's not overridable.
In a followup we can group those changes together in the UI.

Test: atest com.android.settings.development.compat.PlatformCompatDashboardTest
bug: 148009004
Change-Id: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
Merged-In: I833669f7f2a5128bdeda7451b8ff6e0bb753c500
 2020-03-03 11:16:01 +00:00
Automerger Merge Worker
db71edac5c Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 am: 42b698cdc5 
Change-Id: Ia4e41acdae5a840cf18a4d24493fb8a8a1e30c60
 2020-03-03 10:49:48 +00:00
Automerger Merge Worker
86774c7151 Remove reference to PhoneConstant. am: 28c11a8c01 am: c405329ce7 
Change-Id: Ie10acbfdf8512666458dba1fad4cf34c13e1b798
 2020-03-03 10:49:45 +00:00
Automerger Merge Worker
42b698cdc5 Merge changes I193805ef,I2e1b9ac5 am: 1ea70d24d5 
Change-Id: I237ff4ef41d3dfb3fd74f74e0c252898d19962e5
 2020-03-03 10:27:48 +00:00
Automerger Merge Worker
c405329ce7 Remove reference to PhoneConstant. am: 28c11a8c01 
Change-Id: I635f49570f67f88cca0f937bb3aac3361f9a926a
 2020-03-03 10:27:47 +00:00
Bonian Chen
a0b4ca3684 [Settings] Replace isImsRegistered 
Replace isImsReigstered() by callback from ImsMmTelManager.

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Merged-In: I904da749df7074918d205ebd004a173ed109c561
Change-Id: I193805ef947636e50bb21d273be15361378d8f8a
 2020-03-03 15:11:27 +08:00
tom hsu
28c11a8c01 Remove reference to PhoneConstant. 
Create static constant in SimStatusDialogController.

Test: make
Test: m RunSettingsRoboTests
Change-Id: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
Merged-In: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
 2020-03-03 15:08:36 +08:00
Arc Wang
9e46a0bc93 [Wi-Fi] Ignore incorrect user certificates 
These incorrect user certificates displayed when users
editing a Wi-Fi network of WPA3-Enterprise in 192bit.

Bug: 149763958
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: Idcbc80aa3e945f83ba6b77ebf9ef443398ef8e3c
Merged-In: Iab35ac975933abc54fda83b99a2109d53d6722d4
 2020-03-02 22:28:46 +08:00
Automerger Merge Worker
9e2de70584 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 
Change-Id: Ifeeb244d4dddebb4b05b4a7489d0fb28a195c4ad
 2020-02-28 06:16:40 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
Automerger Merge Worker
48b2b18c89 Merge "[Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null" into qt-qpr1-dev am: efe4cc3db4 
Change-Id: I53a9add4cf2cd2b5dcac408d8d1953e2166eacfc
 2020-02-27 06:25:24 +00:00
changbetty
288fa30c2d [Telephony Setting] Add supplementary conditions for CDMA display IMEI info when subscriptionInfo is null 
Bug: 149307162
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ImeiInfoDialogControllerTest
Change-Id: I1dd83ba55b34433b2b600b8a998000347b6ae5e8
Merged-In: I011b52fd25ca9ad48be3afcdabd9bdd443cd121d
 2020-02-26 18:23:31 +08:00
Automerger Merge Worker
9a49dd2bc4 Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d 
Change-Id: I7b32dea30b97fc1389054eb93b9dc160a1c88d3c
 2020-02-21 22:41:37 +00:00
Automerger Merge Worker
63da73532d Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee 
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
 2020-02-21 22:23:21 +00:00
Sarah Chin
7c849787ee Merge "Rename references to getLteOnCdmaMode" 2020-02-21 22:09:16 +00:00
Automerger Merge Worker
44f654fe43 Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca am: fd2e26d4aa 
Change-Id: I741968b993698cf459c670678957276fef68ebbc
 2020-02-21 17:02:44 +00:00
Automerger Merge Worker
fd2e26d4aa Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." am: 317c9dc2ca 
Change-Id: I8a1f4c22237436e5e2e262a3723c39ae346a87fa
 2020-02-21 16:44:30 +00:00
Sarah Chin
51617e3ceb Rename references to getLteOnCdmaMode 
Use @SystemApi TelephonyManager#isGlobalModeEnabled()

Test: build
Bug: 147335742
Change-Id: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
Merged-In: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
 2020-02-20 16:43:13 -08:00
Joshua Duong
0110afcc46 [adb-wireless] Add Wireless Debugging Switch in Developer options. 
Bug: 111434128
Bug: 119492574

Test: make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebugging
Change-Id: I188badb43035172642cf235bb27e56d3a1dea169
Merged-In: I188badb43035172642cf235bb27e56d3a1dea169
 2020-02-20 06:13:15 +00:00
Betty Chang
56235e44c5 Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c am: 74d5ae043c 
Change-Id: Ief23331634bdccae49104db98193d0d842a7c99c
 2020-02-17 07:01:23 +00:00
Betty Chang
74d5ae043c Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c 
Change-Id: Iaec059c5f4bc8cef5dd4a6b77205bdd633782ed3
 2020-02-17 06:46:24 +00:00