PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,217 Commits 1 Branch 0 Tags
1dc5a0cd386c60a944c2dd5e3aaa55adf1e81ab1
Commit Graph

11718 Commits

Author SHA1 Message Date
Peter Wang
5ef6e587c1 Merge "Fix coding styles for erase euicc only options" am: d3db03b520 am: 2f30e9107a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I82d7a91f9136998b8b438627ed68248a22c1dfa6
 2021-03-25 21:36:39 +00:00
Peter Wang
5babfac3d1 Fix coding styles for erase euicc only options 
Bug: 159650638
Test: Build
Change-Id: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
Merged-In: I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2
 2021-03-25 11:13:29 -07:00
Peter Wang
204f35dc58 Merge "Removed unused import" am: 3fbb8612f5 am: 3cac950712 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: I9764d7070c44f8b8db654e9f6520d4f5c6d00cb3
 2021-03-25 04:25:54 +00:00
Peter Wang
447fc31966 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c am: e74a04b3a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: I7a0a8993fbadd72cfe1dfb16879fb235b67ff007
 2021-03-24 19:32:58 +00:00
Peter Wang
f8f7876c01 Removed unused import 
Test: Build
Bug: N/A
Change-Id: Idd87913a67486deaf125b5b5aed89600bfac1982
 2021-03-24 11:26:16 -07:00
Peter Wang
0b5532f67c Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" 2021-03-24 18:12:14 +00:00
Weng Su
0b34d62f6b Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393

Change-Id: If5fddd3870d6c1bf94cf235439bf3543432824d9
 2021-03-24 05:25:04 +00:00
Bonian Chen
1f5c043b0c Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 am: de520dd11a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: I88dff2ed3675305469015351c54272ea6a0d1854
 2021-03-22 13:01:19 +00:00
Bonian Chen
0fd51cc9ea [Settings] Rollback design for getSystemService(String) 
Some of the design are intented for getSystemService(String).
Rollback those items.

Bug: 179640862
Test: local
Change-Id: I581070afb380a86c6352322f927c269b4527aee9
 2021-03-22 09:44:22 +00:00
Weng Su
020af77825 Hide edit menu if network is uneditable 
- Screenshot:
  https://screenshot.googleplex.com/3BhZRBrmQXjeaGL

Bug: 161896161
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test

Merged-In: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
Change-Id: I47ea2cf19e178eff48f23e56903d0daa4ef8fa28
(cherry picked from commit b7dbd3a911)
 2021-03-22 09:43:57 +00:00
Bonian Chen
f9f2fe3f84 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 am: 70f887af52 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I89fa2de521bb07911f0c7ee0122ba3b2cb062fab
 2021-03-22 09:36:16 +00:00
Bonian Chen
13fb77c652 Merge "[Settings] Convert to getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
Bonian Chen
db6c47756d [Settings] Convert to getSystemService(Class<T>) 
Change to getSystemService(Class<T>) to align the capability with framework
part.

Bug: 179640862
Test: local
Change-Id: I1b4812044fc4876bec6645570049a60f9470dbbd
 2021-03-22 06:20:19 +00:00
SongFerng Wang
34c8d35cd3 Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b am: b3f2e9090a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828

Change-Id: I5ba679ca3d2a6f6411dae1ffdc441527508d4763
 2021-03-22 03:56:36 +00:00
SongFerng Wang
3ac3cce15b Merge "Change the behavior of notifyAllowedNetworkTypesChanged." 2021-03-21 16:45:59 +00:00
Chiachang Wang
7dce573e9d Merge "Update mocking to correct target methods" am: efa884758b am: b64bf233a3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I8fed607cd748348e714470f5fe8159abe445313d
 2021-03-18 14:29:12 +00:00
Chiachang Wang
6290ad9509 Update mocking to correct target methods 
The correct target context should use the mActivity in
MobileNetworkSettingsTest, so that the mocking for
telephony service could correctly applied.

Both AutoTimeZonePreferenceControllerTest and
BasebandVersionPreferenceControllerTest refer to the lib
implemented shadow Connectivitymanager but that does not
the correct reference after utils class being updated.
Update the test logic inside to refer to correct method.
The reference to ShadowConnectivityManager does not needed
anymore so remove it from the test.

Fix: 183068151
Fix: 183067742
Fix: 183068139
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.network.telephony.MobileNetworkSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.datetime.AutoTimeZonePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings\
.deviceinfo.firmwareversion.BasebandVersionPreferenceControllerTest

Change-Id: I15ecc6aab7d530d20cd23b06267cc184a2c62b40
 2021-03-18 14:53:07 +08:00
Treehugger Robot
e5dfff612b Merge "Replace hidden CM#isNetworkSupported() usage" am: 959325e88a am: 207fa629bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639940

Change-Id: I4fda2ca5e2415431af1d7178064e3f05e46d2715
 2021-03-18 03:41:57 +00:00
Peter Wang
66fd9dbad2 Added an option in reset menu in Settings to enable resetting Euicc data 
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
Merged-In: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
 2021-03-17 15:47:48 -07:00
Chiachang Wang
d507dc19b1 Replace hidden CM#isNetworkSupported() usage 
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.

Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
Merged-In: I8f1d11558b1be575a0777ed195abe027e838cb74
 2021-03-17 15:22:40 +00:00
SongFerngWang
2166de23f3 Change the behavior of notifyAllowedNetworkTypesChanged. 
Bug: 180903931
Test: atest AllowedNetworkTypesListenerTest.java
Change-Id: Ic94816415920bf25896ef2b198e228f369039c94
Merged-In: Ic94816415920bf25896ef2b198e228f369039c94
 2021-03-17 21:20:21 +08:00
Bonian Chen
d42d9a41f6 Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02 am: c27980c1a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941

Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
 2021-03-16 14:45:42 +00:00
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines 
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
 2021-03-16 10:24:24 +00:00
Zoey Chen
9988792138 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib339b36768196e6e5f676944754d5736937b16cd
 2021-03-09 11:51:04 +00:00
Zoey Chen
9abf2bff3b Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" 2021-03-09 10:35:53 +00:00
Ahaan Ugale
3879729cd1 Merge "OWNERS for autofill and assist settings." am: 7af352dc73 am: 6d5dc7b451 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb4accc78e211a45df173186defaca5634aa1b29
 2021-03-08 07:06:26 +00:00
Ahaan Ugale
1014194897 OWNERS for autofill and assist settings. 
tests/unit/../autofill is empty here; new files are being added in the
internal repo.

Change-Id: Ia4aaa395b01147ee0597cca6075aae0121de7dd9
Test: n/a
 2021-03-07 00:40:15 +00:00
SongFerng Wang
cc1715e2c0 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cde83c4699a3859c3a0748688ab0c0dc0fd5a04
 2021-03-05 05:17:42 +00:00
Zoey Chen
bf1857e4a5 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5 
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
Merged-In: I52af54045872bbf13e64d5d94c8b027ec702abb9
 2021-03-05 11:46:46 +08:00
SongFerng Wang
6775f40664 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" 2021-03-05 01:59:53 +00:00
Treehugger Robot
32d2075fa3 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." 2021-03-05 00:02:28 +00:00
SongFerng Wang
1cb02f5e0d Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I298f46dd7e44e63141b91ccdd67ea7ebbefc9015
 2021-03-04 13:45:19 +00:00
SongFerngWang
959454f32a Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de84a9f2ee32569f71fd46fc87a448237147d02
 2021-03-04 13:45:18 +00:00
SongFerngWang
fc435e3736 Replace allowedNetworkTypes with allowedNetworkTypesForReason 
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest

Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
Merged-In: I2b981569ad11cf70a558c1952cc2e077464328d8
 2021-03-04 19:20:04 +08:00
SongFerngWang
1ffba4af4e [Testcase] To migration DisabledSubscriptionControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
   to get context
3. Change Copy Right
4. remove the mock of PreferenceScreen

Bug: 173003522
Test: atest DisabledSubscriptionControllerTest.java
Change-Id: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
Merged-In: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
 2021-03-04 09:41:56 +00:00
SongFerngWang
766f78e8ed Use SubscriptionManager.getResourcesForSubId to get Resources 
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
 2021-03-04 09:41:31 +00:00
SongFerng Wang
a0a079ed11 Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68dd01db1ee41b4baf09338872edc8599d892f96
 2021-03-04 07:41:45 +00:00
changbetty
44812e5f61 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 am: d64a350d86 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7cde36e5bc7ca5b0899915eaaaf04c0dd974f22
 2021-03-04 07:41:43 +00:00
changbetty
f0ea678e15 [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf am: fec00ac4b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I280b6ed2f09e4c040c4563582cee05c3a03c66bc
 2021-03-04 07:41:09 +00:00
changbetty
d64a350d86 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id43b7eb15d35bc2c3730b3118d399c8d4f66424f
 2021-03-04 06:48:18 +00:00
changbetty
fec00ac4b7 [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d5ff0ee3f8af2de5387d61094be0d9f3c35ce6b
 2021-03-04 06:48:02 +00:00
Janis Danisevskis
e92bcb3287 Keystore 2.0: Update Wifi settings to use mostly public keystore API. 
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
 2021-03-03 22:30:35 -08:00
SongFerng Wang
cbc2c4f102 Merge changes I89162011,I110727b6,I1778832b 
* changes:
  Settings JUnit test for PreferredNetworkModeContentObserverTest
  [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files
  [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
 2021-03-04 06:17:31 +00:00
Jeremy Goldman
3611c3e22f Settings JUnit test for PreferredNetworkModeContentObserverTest 
Biggest difference here: the use of a MockContentProvider

Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
Merged-In: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
 2021-03-03 23:39:07 +08:00
changbetty
fbb61ba4d0 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. To get the original value and add @After to restore the data

Bug:
Test: atest -c CdmaListPreferenceTest
      atest -c CdmaSubscriptionPreferenceControllerTest
      atest -c CdmaSystemSelectPreferenceControllerTest
Change-Id: I110727b643a6755ee888708bd1fb2a39cf524a2d
Merged-In: I110727b643a6755ee888708bd1fb2a39cf524a2d
 2021-03-03 23:35:43 +08:00
changbetty
2e763e52cf [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right
4. Create the real object for PhoneAccountHandle and ComponentName

Bug: 164989754
Test: atest -c MobileNetworkUtilsTest
Change-Id: I1778832b0602062adb24928343c0c1d0e525942d
Merged-In: I1778832b0602062adb24928343c0c1d0e525942d
 2021-03-03 23:33:00 +08:00
Janis Danisevskis
2c74864579 Keystore 2.0: Update Wifi settings to use mostly public keystore API. 
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
 2021-03-01 20:09:08 -08:00
Paul Hu
155d4d6cd3 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cd486a47be45f68ad7b0db82dcb030a62edb0da
 2021-02-25 09:37:00 +00:00
Paul Hu
995581e856 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe3e26c5bdda32edf656b4d7e94d2dc17c14e06
 2021-02-25 08:19:44 +00:00
Paul Hu
cbcea32087 Merge "Replace ConnectivityManager hidden symbols on Settings" 2021-02-25 07:44:50 +00:00