PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
0a6d53887923fdc431552d0acb9d1a3a156a2562
app_Settings/src/com/android/settings
History
Stanley Tng 0cc7d9a2af resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
2018-10-16 15:31:00 +00: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
Fix Connect State message in Device details for Hearing Aids
2018-10-02 15:10:43 -07:00
connecteddevice
Merge "Clean up: delete unused methods"
2018-09-12 17:12:54 -07:00
core
resolve merge conflicts of 019a771d2d to stage-aosp-master
2018-10-15 17:30:02 -07:00
dashboard
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
datausage
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
datetime
Merge "Use ICU APIs not impl types"
2018-10-02 06:16:23 -07:00
deletionhelper
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
development
resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
2018-10-16 15:31:00 +00:00
deviceinfo
Merge "Move content later button doesn't work on Migration Wizard"
2018-10-12 14:07:25 -07:00
display
Merge "Add null check for vrManager" into pi-dev
2018-10-10 11:07:11 -07:00
dream
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
2018-09-25 10:20:06 -07:00
nfc
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
notification
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
overlay
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
password
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
print
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
search
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
security
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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 Import clean up.
2018-09-04 13:54:46 -07: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
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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
…
AirplaneModeVoiceActivity.java
…
AllowBindAppWidgetActivity.java
…
AppWidgetLoader.java
…
AppWidgetPickActivity.java
…
BandMode.java
…
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
…
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-02 18:07:25 -07:00
DeviceAdminSettings.java
…
DialogCreatable.java
…
DisplaySettings.java
…
EditPinPreference.java
…
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 error message shown when SIM PIN enable/disable fails"
2018-10-15 10:42:52 -07:00
LegalSettings.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
LinkifyUtils.java
…
ManualDisplayActivity.java
…
MasterClear.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
2018-10-12 16:03:02 -07: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
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
SettingsDumpService.java
…
SettingsInitialize.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00
SettingsLicenseActivity.java
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07: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
TetherProvisioningActivity.java
…
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
DO NOT MERGE Import clean up.
2018-09-04 13:54:46 -07:00