Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e2f74af0638d8bec6d974b665befc36e9355c367
packages_apps_Settings/src/com/android/settings
History
Chalard Jean e2f74af063 Merge "Support VPN Proxy(2/2)" 
am: 2a695c4b7b

Change-Id: I58553c28c8f4e87a52169f925da70c2edb89ca71
2019-03-08 06:42:57 -08:00
..
accessibility
Add config to disable app tray preview in display size.
2018-09-10 19:01:35 -07:00
accounts
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
applications
Merge "Fix a crash when launching app detail for bad package name"
2018-09-11 18:28:08 -07:00
backup
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
bluetooth
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
2019-02-14 00:03:58 -08:00
connecteddevice
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
2019-02-14 00:03:58 -08:00
core
resolve merge conflicts of 019a771d2d to stage-aosp-master
2018-10-15 17:30:02 -07:00
dashboard
Add Dynamic tiles
2019-01-16 00:54:07 +00:00
datausage
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
datetime
Update the timestamp used for time zone filtering
2019-02-27 15:02:03 +00:00
deletionhelper
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
development
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
2019-02-21 11:03:43 -08:00
deviceinfo
Merge "Make migrate option menu invisible when src volume is not mounted"
2018-12-04 17:33:33 +00:00
display
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
2019-02-14 00:03:58 -08:00
dream
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
2019-02-14 00:03:58 -08:00
enterprise
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
fingerprint
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
fuelgauge
Add additional anomaly types.
2019-02-25 14:51:10 +00:00
gestures
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
graph
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
inputmethod
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
language
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
localepicker
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
location
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
network
Support entitlement check in DSDS
2019-02-12 16:17:36 +08:00
nfc
Add support for FEATURE_NFC_ANDROID_BEAM
2018-12-18 16:08:43 -08:00
notification
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
overlay
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
2018-12-11 15:24:05 -08:00
password
Merge pie-platform-release to aosp-master - DO NOT MERGE
2018-10-24 14:47:27 -07:00
print
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
search
Merge pie-platform-release to aosp-master - DO NOT MERGE
2018-10-24 14:47:27 -07:00
security
Add Enterprise owners for Enterprise settings
2019-01-24 12:29:56 +00:00
shortcut
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
sim
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
slices
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
2018-12-11 15:24:05 -08:00
sound
Merge "Fix incorrect API invoke for BT profiles"
2018-09-21 13:13:39 -07:00
support
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
survey
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
system
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
tts
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
users
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
utils
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
vpn2
Support VPN Proxy(2/2)
2019-03-06 10:38:48 +09:00
wallpaper
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
webview
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
wfd
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
widget
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
wifi
WFC roaming mode setting can not be used with a fixed value
2019-03-06 23:38:11 +00:00
wrapper
DO NOT MERGE: Cherry-pick misc fixes to AOSP
2018-08-28 13:38:21 -07:00
AccessiblePreferenceCategory.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
ActivityPicker.java
…
AirplaneModeEnabler.java
Push full slice index to device index
2018-04-26 11:16:04 -04:00
AirplaneModeVoiceActivity.java
…
AllowBindAppWidgetActivity.java
…
AppWidgetLoader.java
…
AppWidgetPickActivity.java
…
BandMode.java
Fix BandMode Dialog Crash on Open due to Style
2019-01-03 09:51:49 -08:00
BrightnessPreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
BugreportPreference.java
…
ButtonBarHandler.java
…
CancellablePreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
CheckableLinearLayout.java
…
CredentialStorage.java
Avoid deprecated PrivateKeyInfo.getAlgorithmId()
2018-10-02 12:29:06 +00:00
CryptKeeper.java
Revert "Revert "Schematize vold system properties""
2018-12-13 15:36:39 -08:00
CryptKeeperConfirm.java
…
CustomListPreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
DateTimeSettings.java
…
DefaultRingtonePreference.java
…
DeviceAdminAdd.java
Unrestrict app if it been set as device admin app
2018-07-17 23:28:31 +00:00
DeviceAdminSettings.java
…
DialogCreatable.java
…
DisplaySettings.java
Convert auto-brightness switch to a full screen UI.
2018-04-10 14:21:00 -07:00
EditPinPreference.java
Fix text alignment in SIM lock dialog.
2018-04-17 16:24:19 -07:00
EncryptionInterstitial.java
…
EventLogTags.logtags
…
FallbackHome.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
HelpTrampoline.java
…
IccLockSettings.java
Merge "Fix toast is covered by PIN code screen after wrong pin"
2018-10-24 02:16:57 +00:00
LegalSettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
LinkifyUtils.java
…
ManualDisplayActivity.java
Remove unused system properties
2018-12-20 00:33:24 +00:00
MasterClear.java
Revert "Revert "Schematize vold system properties""
2018-12-13 15:36:39 -08:00
MasterClearConfirm.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
MonitoringCertInfoActivity.java
…
PointerSpeedPreference.java
…
PreviewPagerAdapter.java
Add config to disable app tray preview in display size.
2018-09-10 19:01:35 -07:00
PreviewSeekBarPreferenceFragment.java
Add config to disable app tray preview in display size.
2018-09-10 19:01:35 -07:00
PrivacySettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
ProgressCategory.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
ProgressCategoryBase.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
ProxySelector.java
…
RadioInfo.java
Moved data settings to phone
2018-12-20 15:23:11 -08:00
RegulatoryInfoDisplayActivity.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
RemoteBugreportActivity.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
ResetNetwork.java
…
ResetNetworkConfirm.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
RestrictedCheckBox.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
RestrictedListPreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
RestrictedRadioButton.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
RestrictedSettingsFragment.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
RingtonePreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
SeekBarDialogPreference.java
…
SelfAvailablePreference.java
…
SetFullBackupPassword.java
new password shouldn't be empty string
2018-07-10 10:48:56 +08:00
Settings.java
Add unofficial intent for WifiTetherSettings
2018-06-20 09:17:08 -07:00
SettingsActivity.java
Merge pie-platform-release to aosp-master - DO NOT MERGE
2018-10-24 14:47:27 -07:00
SettingsDumpService.java
Add anomaly log to dumpsys
2018-04-03 17:08:47 -07:00
SettingsInitialize.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
SettingsLicenseActivity.java
Remove unused system properties
2018-12-20 00:33:24 +00:00
SettingsPreferenceFragment.java
Merge "Clean up: delete unused methods"
2018-09-12 17:12:54 -07:00
SetupEncryptionInterstitial.java
…
SetupRedactionInterstitial.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
SetupWizardUtils.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
SmsDefaultDialog.java
…
SubSettings.java
…
SummaryPreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
TestingSettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
TestingSettingsBroadcastReceiver.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
TetherSettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
TimeoutListPreference.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
TouchBlockingFrameLayout.java
…
TrustedCredentialsDialogBuilder.java
…
TrustedCredentialsSettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
UsageStatsActivity.java
…
UserCredentialsSettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
Utils.java
Support entitlement check in DSDS
2019-02-12 16:17:36 +08:00