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

72063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Wang
ae74222567 Merge "Fix intent String for starting profile management page in Manifest" 2021-04-09 22:24:58 +00:00
Peter Wang
f40897d27e Fix intent String for starting profile management page in Manifest 
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
Merged-In: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
 2021-04-09 13:33:15 -07:00
Almaz Mingaleev
90d5572fa5 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: Ia7c9b9c683429dcb51b79c57d745c7763a888721
 2021-04-07 16:55:48 +00:00
Almaz Mingaleev
e3d4e39144 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." 2021-04-07 16:19:33 +00:00
Treehugger Robot
e7ff215244 Merge "Modify the value of intent-filter" am: 15ecc3610d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: Ic58bf302f23ae363d22a3ca7b636c9586dc04364
 2021-04-07 10:42:47 +00:00
Treehugger Robot
15ecc3610d Merge "Modify the value of intent-filter" 2021-04-07 10:11:06 +00:00
Almaz Mingaleev
3be24f4ab2 Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils. 
That timestamp is used in two places for the same purpose.

Bug: 155738410
Test: presubmit
Change-Id: Ia6836fd34c63aef6e335ef97922d34a60dbf3703
 2021-04-06 14:10:05 +01:00
Bonian Chen
a472f53325 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" am: 194af56330 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1659980

Change-Id: I0330a149d0b686e8acee05a5028f67e1cb7ad3a6
 2021-03-31 15:03:38 +00:00
Bonian Chen
194af56330 Merge changes from topic "revert-1645152-getSystemService(Class<T>)-KMFSZZGDPU" 
* changes:
  Revert "[Settings] Support getSystemService(Class<T>)"
  Revert "[Settings] Convert to getSystemService(Class<T>)"
 2021-03-31 14:30:40 +00:00
Bonian Chen
2b195b4335 Revert "[Settings] Support getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
 2021-03-31 09:37:03 +00:00
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
 2021-03-31 09:37:03 +00:00
Almaz Mingaleev
87273aab56 Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: If30061d2e580c2cbb0a9ca2dc00f66604264a02d
 2021-03-30 08:57:53 +00:00
Almaz Mingaleev
2cd0b0aadf Merge "Allow alternative time zone ID to be set device's zone." 2021-03-30 08:33:37 +00:00
Almaz Mingaleev
dd2a685756 Allow alternative time zone ID to be set device's zone. 
If America/Godthab is set as device time zone, display it as if
America/Nuuk is chosen.
If time zone is known, but is not an alternative and not shown
in time zone picker, region will de derived from user's locale.

Bug: 155738410
Test: atest com.android.settings.datetime.timezone.model
Test: set persist.sys.timezone via adb and checked
Date & Time screen

Change-Id: I168fb4319e144dbe9e2496d06a681d4c09b411c0
 2021-03-29 11:18:57 +01:00
Peter Wang
2f30e9107a Merge "Fix coding styles for erase euicc only options" am: d3db03b520 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068

Change-Id: I0d7be5bf2e40af9a0c345be284a5bcc2058ebc8e
 2021-03-25 20:50:10 +00:00
Peter Wang
d3db03b520 Merge "Fix coding styles for erase euicc only options" 2021-03-25 20:14:54 +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
3cac950712 Merge "Removed unused import" am: 3fbb8612f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652770

Change-Id: Ib2f683ebd6e5bb71d9702c698b6a112ba7b523b7
 2021-03-25 03:46:25 +00:00
Peter Wang
3fbb8612f5 Merge "Removed unused import" 2021-03-25 03:12:57 +00:00
Peter Wang
e74a04b3a8 Merge "Added an option in reset menu in Settings to enable resetting Euicc data only" am: 0b5532f67c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1562838

Change-Id: Ia2dccf44b762bc5cf805f4c2aa3fea7f937c921c
 2021-03-24 18:56:56 +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
Janis Danisevskis
c90b511239 Merge "Keystore 2.0: Remove references to Keystore 1.0" am: 7aa99fe966 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624590

Change-Id: I75e8e09c230cfb805ab3b2d6699aca2cd2514eac
 2021-03-23 03:51:26 +00:00
Janis Danisevskis
7aa99fe966 Merge "Keystore 2.0: Remove references to Keystore 1.0" 2021-03-23 03:14:28 +00:00
Janis Danisevskis
75a91836e7 Keystore 2.0: Remove references to Keystore 1.0 
Test: N/A
Bug: 171305684
Change-Id: I8b50c024e919d5b98348b792e0769c510ff1a33d
 2021-03-22 13:35:53 -07:00
SongFerng Wang
d1278a3d3d Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf810 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I9acfb31454bc8d63480adc64311717c07715d6f0
 2021-03-22 19:22:27 +00:00
SongFerng Wang
5292baf810 Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" 2021-03-22 19:06:48 +00:00
Bonian Chen
de520dd11a Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: Ib628d337f511f67b88f34f6ef426d21a6176d817
 2021-03-22 12:40:43 +00:00
Bonian Chen
7a8463dbf8 Merge "[Settings] Rollback design for getSystemService(String)" 2021-03-22 11:57:51 +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
Bonian Chen
70f887af52 Merge "[Settings] Convert to getSystemService(Class<T>)" am: 13fb77c652 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645152

Change-Id: I3c76b1bf371a7bd8ecaea8b8c23a4a908e8b2c06
 2021-03-22 08:56:33 +00:00
Bonian Chen
5734490d23 Merge "[Settings] Support getSystemService(Class<T>)" am: 513da92357 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639943

Change-Id: Id7a6f8c0c21d2bf5112a91554f608974586588c1
 2021-03-22 08:56:21 +00:00
Bonian Chen
13fb77c652 Merge "[Settings] Convert to getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
Bonian Chen
513da92357 Merge "[Settings] Support getSystemService(Class<T>)" 2021-03-22 08:18:59 +00:00
SongFerngWang
e88740eae2 KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray 
Bug: 179814490
Test: build pass
Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
Merged-In: I9d2abe1abe3082267ed64b71602d8ada21c95c6c
 2021-03-22 07:17:22 +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
b3f2e9090a Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828

Change-Id: I74750b2abd69c47b753cd3ee6e69e4ec1bbd7339
 2021-03-22 03:12:24 +00:00
SongFerng Wang
3ac3cce15b Merge "Change the behavior of notifyAllowedNetworkTypesChanged." 2021-03-21 16:45:59 +00:00
Chiachang Wang
0080dfa65d Merge "Remove hidden connectivity methods access" am: 3e737c11db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644546

Change-Id: I3d2e0a9d19ceb8c9857f1bccb81a4dcea99f4831
 2021-03-19 08:30:45 +00:00
Chiachang Wang
33855bfd7e Merge "Replace the way to get the network for no internet dialog" am: f26f579c8d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644547

Change-Id: Ic6d6eff65a4047754726ad72a3f66f0ab6ae3710
 2021-03-19 08:27:56 +00:00
Chiachang Wang
3e737c11db Merge "Remove hidden connectivity methods access" 2021-03-19 08:13:06 +00:00
Chiachang Wang
f26f579c8d Merge "Replace the way to get the network for no internet dialog" 2021-03-19 07:54:24 +00:00
Jeremy Goldman
218ca3cbe9 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" am: 19c5d0a749 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1634463

Change-Id: I22f165eba9482a6493e4e2bf7ce487208e6c0cf5
 2021-03-19 06:43:58 +00:00
Jeremy Goldman
19c5d0a749 Merge "Add goldmanj to the Settings' vpn2 directory Owners file" 2021-03-19 06:15:40 +00:00
android-build-team Robot
2f2b6c60f5 Merge cherrypicks of [13924074, 13924075, 13924587, 13923962, 13924417, 13924418, 13924419, 13923941, 13924588, 13923901, 13923902, 13924076, 13924077, 13924420, 13924421, 13924422, 13924423, 13924424, 13924645, 13924589, 13922107, 13924332, 13924333, 13924334, 13924335, 13924336, 13924665, 13923963, 13924646, 13924590, 13924666, 13923971, 13923942] into rvc-qpr2-release 
Change-Id: I4c0d13ddb22de428f73f0f59bba41095a3e4b188
 2021-03-19 00:02:15 +00:00
Andras Kloczl
d4f04398c7 Prevent using invalid result uri during multi user image change 
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
(cherry picked from commit 07e414017c)
 2021-03-19 00:00:22 +00:00
Chiachang Wang
eedfa1d307 Remove hidden connectivity methods access 
This commit resolves the hidden methods accesses for
LinkProperties, IpConfiguration and RouteInfo with atlernative
way for the connectivity mainline module preparation.

Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.UtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test

Change-Id: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
Merged-In: Iec4dab5d9fa12dedcf69a1cfe2a8be0956bc0d79
 2021-03-18 22:25:05 +08:00
Chiachang Wang
b64bf233a3 Merge "Update mocking to correct target methods" am: efa884758b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1644306

Change-Id: I2d68748adf0154af2a3b9017d4510041af5baf12
 2021-03-18 13:53:11 +00:00
Chiachang Wang
efa884758b Merge "Update mocking to correct target methods" 2021-03-18 13:16:14 +00:00
Chiachang Wang
11c37350d9 Replace the way to get the network for no internet dialog 
It's a refactor work for incoming connectivity mainline. The
network information contained in the no ineternet notification
action was placed the target network id. The receiver which is
Settings will need to construct the network from the network id
using the hidden Network constructor. Since Network is moving
into module, Settings will not be able to access it. Apps should
use Network instead of network id, so just send the network
object to Settings.

Update the corresponding logic in Settings.

Bug: 172183305
Test: manually test with no internet dialog and check the
      behavior and log
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
      com.android.settings.wifi.WifiNoInternetDialogTest
Change-Id: I75c04d6f1c2159ae990f6015551eb39d99266336
 2021-03-18 11:35:05 +00:00