Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fbdc2f2e5ea243e4553bd151b3b9a68865a91f73
packages_apps_Settings/src/com/android/settings
History
Salvador Martinez fbdc2f2e5e resolve merge conflicts of 42d0815115 to master 
Change-Id: I949e09de6aade8d07857a2b8d4bd34a549795939

Bug: None
Test: I solemnly swear I tested this conflict resolution
2018-04-20 18:10:13 -07:00
..
accessibility
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
accounts
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
applications
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
backup
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
bluetooth
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
connecteddevice
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
core
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
dashboard
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
datausage
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
datetime
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
deletionhelper
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
development
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
deviceinfo
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
display
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
dream
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
enterprise
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
fingerprint
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
fuelgauge
resolve merge conflicts of 42d0815115 to master
2018-04-20 18:10:13 -07:00
gestures
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
graph
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
inputmethod
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
language
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
localepicker
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
location
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
network
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
nfc
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
notification
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
overlay
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
password
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
print
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
search
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
security
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
shortcut
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
sim
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
slices
Catch exception when failing to create slice
2018-04-20 15:46:35 -07:00
sound
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
support
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
survey
…
system
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
tts
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
users
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
utils
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
vpn2
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
wallpaper
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
webview
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
wfd
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
widget
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
wifi
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
wrapper
Merge "Remove wrapper for ConnectionManager/IPackageManager" into pi-dev
2018-04-03 18:31:39 +00:00
AccessiblePreferenceCategory.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
ActivityPicker.java
…
AirplaneModeEnabler.java
Refactor airplane mode preference controller.
2018-04-12 14:10:35 +08:00
AirplaneModeVoiceActivity.java
…
AllowBindAppWidgetActivity.java
…
AppWidgetLoader.java
…
AppWidgetPickActivity.java
…
BandMode.java
…
BrightnessPreference.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
BugreportPreference.java
…
ButtonBarHandler.java
…
CancellablePreference.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
CheckableLinearLayout.java
…
CredentialStorage.java
CredentialStorage: Fix manual key installation.
2017-11-23 16:51:04 +00:00
CryptKeeper.java
…
CryptKeeperConfirm.java
Change superclass to InstrumentedFragment.
2018-02-02 13:41:16 -08:00
CustomListPreference.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
DateTimeSettings.java
Autogenerate SearchIndexableResources subclass
2018-04-03 10:26:55 -07:00
DefaultRingtonePreference.java
…
DeviceAdminAdd.java
Handle getActiveAdmins() == null safely.
2017-12-11 21:01:58 +01:00
DeviceAdminSettings.java
Migrate to use instrumentation classes from settingslib.
2018-01-24 12:30:39 -08:00
DialogCreatable.java
…
DisplaySettings.java
Convert auto-brightness switch to a full screen UI.
2018-04-10 21:25:09 +00:00
EditPinPreference.java
Fix text alignment in SIM lock dialog.
2018-04-17 16:24:19 -07:00
EncryptionInterstitial.java
…
EventLogTags.logtags
Add event log tag for measuring settings latency
2017-12-19 16:22:03 -08:00
FallbackHome.java
…
HelpTrampoline.java
…
IccLockSettings.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
LegalSettings.java
Migrate LegalSettings to DashboardFragment
2018-04-19 14:42:00 -07:00
LinkifyUtils.java
…
ManualDisplayActivity.java
…
MasterClear.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
MasterClearConfirm.java
Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog.
2018-03-05 20:27:51 +00:00
MonitoringCertInfoActivity.java
…
PointerSpeedPreference.java
…
PreviewPagerAdapter.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
PreviewSeekBarPreferenceFragment.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
ProgressCategory.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
ProgressCategoryBase.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
ProxySelector.java
Change superclass to InstrumentedFragment.
2018-02-02 13:41:16 -08:00
RadioInfo.java
Rename setDataEnabled to setUserDataEnabled.
2018-01-08 18:08:01 -08:00
RegulatoryInfoDisplayActivity.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
RemoteBugreportActivity.java
…
ResetNetwork.java
Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog.
2018-03-05 20:27:51 +00:00
ResetNetworkConfirm.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
RestrictedCheckBox.java
…
RestrictedListPreference.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
RestrictedRadioButton.java
…
RestrictedSettingsFragment.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
RingtonePreference.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
SeekBarDialogPreference.java
…
SelfAvailablePreference.java
…
SetFullBackupPassword.java
…
Settings.java
Implement audio switch UI
2018-04-15 04:22:25 +00:00
SettingsActivity.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
SettingsDumpService.java
Add anomaly log to dumpsys
2018-04-03 17:08:47 -07:00
SettingsInitialize.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
SettingsLicenseActivity.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
SettingsPreferenceFragment.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
SetupEncryptionInterstitial.java
…
SetupRedactionInterstitial.java
…
SetupWizardUtils.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
SmsDefaultDialog.java
…
SubSettings.java
…
SummaryPreference.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
TestingSettings.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
TestingSettingsBroadcastReceiver.java
…
TetherProvisioningActivity.java
…
TetherSettings.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
TimeoutListPreference.java
…
TouchBlockingFrameLayout.java
…
TrustedCredentialsDialogBuilder.java
…
TrustedCredentialsSettings.java
Change superclass to InstrumentedFragment.
2018-02-02 13:41:16 -08:00
UsageStatsActivity.java
…
UserCredentialsSettings.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00
Utils.java
Migrate Settings to androidx.
2018-04-20 12:52:29 -07:00