Jeff Sharkey 7c236a0c7e Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit ...

Change-Id: I988ae328e0e9bb99b086490cf2ef48ca19779d13

2017-05-31 09:05:30 -06:00

..

accessibility

Merge "Manual merge of ag/2319717"

2017-05-30 19:46:18 +00:00

accounts

AccountTypePreference layout clean up.

2017-05-30 14:52:51 -07:00

applications

Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev am: 535533680f

2017-05-31 12:09:31 +00:00

backup

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

bluetooth

Add a flag for the Bluetooth device details page

2017-05-24 16:37:42 -07:00

connecteddevice

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

core

Update logPackageName() to use new MetricsLogger API

2017-05-25 13:51:49 -07:00

dashboard

Merge "Add SupportDashboardActivity to secondary user home AI"

2017-05-16 22:38:09 +00:00

datausage

Merge "Set correct uid when loading app icon in data usage UI."

2017-05-25 02:13:13 +00:00

datetime

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

deletionhelper

Don't show warning dialog on opening ASM settings.

2017-04-19 14:04:50 -07:00

development

Bluetooth: Enable in-band ringing by default (1/2)

2017-05-30 15:17:33 -07:00

deviceinfo

Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit

2017-05-31 09:05:30 -06:00

display

AOD: Ambient display settings to dedicated settings screen

2017-05-30 16:42:37 -07:00

dream

Cleanup to screensaver settings for O

2017-05-01 20:08:16 +00:00

enterprise

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

fingerprint

Support find sensor screen with no animation

2017-05-25 11:21:16 -07:00

fuelgauge

Merge "Sort app list after smeared on screen" into oc-dev

2017-05-25 22:41:00 +00:00

gestures

Merge "Add metrics category for the assist gesture settings."

2017-05-25 16:18:54 +00:00

inputmethod

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

language

Remove Language and Input duplicates

2017-05-18 13:57:54 -07:00

localepicker

Updating CreateShortcut activity to use the new ShortcutManager APIs

2017-01-19 13:39:13 -08:00

location

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

network

Merge "Listener to tether state change on Network & internet page." into oc-dev am: 1dead24890

2017-05-25 02:37:59 +00:00

nfc

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

notification

Merge "Allow some system channels to be blocked" into oc-dev am: 540e8f50e3

2017-05-26 15:02:40 +00:00

overlay

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

password

Merge "Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential"

2017-05-31 04:33:34 +00:00

print

Add # of active print jobs back to print setting summary

2017-05-26 16:45:14 -07:00

qstile

Move developer options related class to development package

2017-03-17 16:51:21 -07:00

search

Merge "AOD: Ambient display settings to dedicated settings screen"

2017-05-31 04:25:39 +00:00

security

Use the standard place holder for the security summary.

2017-05-26 16:47:09 -07:00

sim

Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a am: 7e51242c05

2017-03-16 17:33:53 +00:00

support

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

survey

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

system

Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce

2017-05-17 19:06:59 +00:00

trustagent

Refactored TrustAgentUtils to allow agent check injection.

2017-01-19 12:39:38 -08:00

tts

Add title to SeekbarPreference content description.

2017-05-16 12:35:45 -07:00

users

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

utils

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

vpn2

Add a "sign into network" button to the wifi details page.

2017-05-03 22:14:08 +09:00

wallpaper

Use standard preference layout for wallpaper picker

2017-04-17 12:23:52 -07:00

webview

Refactor DefaultAppPicker to a general radio button picker

2017-03-23 12:41:31 -07:00

wfd

Disable wifi display activity if device can't support it.

2017-03-10 13:03:47 -08:00

widget

Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am: bbc260d408

2017-05-30 22:11:21 +00:00

wifi

Merge "Wifi details page: sign-in uses primary color" into oc-dev am: 0c5573a0e3

2017-05-31 00:47:54 +00:00

AccessiblePreferenceCategory.java

…

ActivityPicker.java

…

AirplaneModeEnabler.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

AirplaneModeVoiceActivity.java

…

AllowBindAppWidgetActivity.java

Passing bind options to the service in the bind-widget permission prompt

2017-01-23 10:58:40 -08:00

ApnEditor.java

Disallow adding/editing dun APNs unless allowed by carrier.

2017-05-22 16:01:46 -07:00

ApnPreference.java

Fix mvno match data is incorrect for APNs

2017-03-30 15:54:14 -07:00

ApnSettings.java

Disallow adding/editing dun APNs unless allowed by carrier.

2017-05-22 16:01:46 -07:00

AppHeader.java

Remove code that check for dashboard feature.

2017-03-07 11:15:03 -08:00

ApplicationSettings.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

AppProgressPreference.java

…

AppWidgetLoader.java

…

AppWidgetPickActivity.java

…

BandMode.java

Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List

2016-12-20 11:34:05 -08:00

BrightnessPreference.java

…

BugreportPreference.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

ButtonBarHandler.java

…

CancellablePreference.java

…

CheckableLinearLayout.java

…

CreateShortcut.java

Change MaskableBitmap to AdaptiveBitmap

2017-03-01 15:21:23 -08:00

CredentialStorage.java

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

CryptKeeper.java

Use MIN_LOCK_PASSWORD_SIZE as min password length.

2017-04-06 15:39:58 -07:00

CryptKeeperConfirm.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

CryptKeeperSettings.java

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

CustomDialogPreference.java

…

CustomEditTextPreference.java

Add dev options to set swXdp

2016-04-05 16:47:44 -04:00

CustomListPreference.java

Update package names to work with the proto3 compiler

2016-11-08 14:06:17 +00:00

DateTimeSettings.java

Remove getCategoryKey() from DashboardFragment children.

2017-01-24 14:51:15 -08:00

DefaultRingtonePreference.java

Show RingtonePickerActivity in work user instead

2017-04-12 15:12:44 +01:00

DeviceAdminAdd.java

Disabling the activate button when paused

2017-05-26 15:53:32 -07:00

DeviceAdminSettings.java

Follow API removals.

2017-02-24 12:03:09 -07:00

DeviceInfoSettings.java

Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b

2017-05-17 17:31:08 +00:00

DialogCreatable.java

Log visibility change for DialogCreatable in Settings.

2016-09-21 16:30:32 -07:00

DimmableIconPreference.java

…

DisplaySettings.java

AOD: Ambient display settings to dedicated settings screen

2017-05-30 16:42:37 -07:00

DividerPreference.java

Allow settings preference title to span over multiple lines.

2017-04-11 13:17:38 -07:00

EditPinPreference.java

Fix sim pin settings

2016-03-30 11:41:45 -04:00

EncryptionAndCredential.java

Misc fixes to search and UI.

2017-05-23 14:55:23 -07:00

EncryptionInterstitial.java

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

EventLogTags.logtags

…

FallbackHome.java

Revert "The big keyguard transition refactor (1.1/n)"

2016-11-02 20:33:32 +00:00

HelpTrampoline.java

Use StartActivityForResult to launch the intent.

2017-05-11 10:33:08 -07:00

HotspotOffReceiver.java

Remove hotspot receiver from manifest.

2017-04-11 12:03:54 -07:00

IccLockSettings.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

IconPreferenceScreen.java

…

LegalSettings.java

Remove Wallpaper duplicate from setting search

2017-05-12 12:00:48 -07:00

LicenseHtmlGeneratorFromXml.java

Generate license html file from xml files of partitions

2017-05-01 22:10:06 +00:00

LicenseHtmlLoader.java

Generate license html file from xml files of partitions

2017-05-01 22:10:06 +00:00

LinkifyUtils.java

…

ManualDisplayActivity.java

…

MasterClear.java

Hide "Wipe eUICC" option when it isn't useful.

2017-05-24 16:20:58 -07:00

MasterClearConfirm.java

Use the new OemLockService to get OEM lock state.

2017-04-19 21:33:37 +01:00

MonitoringCertInfoActivity.java

Show different strings when PO/DO user approves a cert

2016-05-31 22:43:09 +01:00

MultiLinePreference.java

Adds a multi line preference class.

2016-03-30 14:39:42 -07:00

OptionsMenuFragment.java

Add InstrumentFragment for non-PreferenceFragment types.

2016-12-05 17:13:33 -08:00

OwnerInfoSettings.java

Add page Settings->Security & lock screen->Lock screen preferences.

2017-03-23 11:35:20 -07:00

PointerSpeedPreference.java

Fix crash on rotate pointer speed

2016-05-10 15:41:30 -04:00

PreviewPagerAdapter.java

Settings: PreviewPagerAdapter: copy the full theme

2017-04-20 20:11:00 +00:00

PreviewSeekBarPreferenceFragment.java

Fix crash when starting Settings -> Display -> Font size

2016-07-21 13:30:54 -07:00

PrivacySettings.java

Fix search results for backup settings.

2017-03-03 12:49:40 +00:00

ProgressCategory.java

Left align preferences and graphs to leave space for icon.

2016-12-19 13:41:37 -08:00

ProgressCategoryBase.java

Left align preferences and graphs to leave space for icon.

2016-12-19 13:41:37 -08:00

ProxySelector.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

RadioInfo.java

Fix typo

2017-05-01 08:31:14 -07:00

RegulatoryInfoDisplayActivity.java

Add safety & regulatory info to "about device".

2016-06-02 14:12:19 -07:00

RemoteBugreportActivity.java

New activity for handling dialogs of remote bugreports

2016-03-03 17:06:05 +00:00

ResetNetwork.java

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

ResetNetworkConfirm.java

Reset APN when doing network reset.

2017-04-20 10:58:32 -07:00

RestrictedCheckBox.java

Allow DPMs to restrict Remote Input on Keyguard

2016-05-12 19:12:17 +00:00

RestrictedListPreference.java

Show info icon when RestrictedListPreference is disabled

2016-07-04 04:01:49 +00:00

RestrictedRadioButton.java

…

RestrictedSettingsFragment.java

Create RestrictedDashboardFragment.

2017-05-08 13:34:54 -07:00

RingtonePreference.java

Show RingtonePickerActivity in work user instead

2017-04-12 15:12:44 +01:00

ScreenPinningSettings.java

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

SecuritySettings.java

Remove duplicates in Security Settings

2017-05-23 17:44:35 +00:00

SeekBarDialogPreference.java

…

SelectableEditTextPreference.java

…

SelfAvailablePreference.java

Rearrange configure/default apps

2016-02-24 08:55:01 -05:00

SetFullBackupPassword.java

…

Settings.java

Clean up choose lock intent creation

2017-05-12 15:35:20 -07:00

SettingsActivity.java

Remove search2 package and put everything into search

2017-05-23 13:57:28 -07:00

SettingsDumpService.java

Dump the default broswer in SettingsDumpService

2016-12-28 11:19:47 -08:00

SettingsInitialize.java

Disable managed profile version of shortcut picker.

2017-05-17 16:44:01 +01:00

SettingsLicenseActivity.java

Generate license html file from xml files of partitions

2017-05-01 22:10:06 +00:00

SettingsPreferenceFragment.java

Merge "Recursively remove preference from screen." into oc-dev am: 7731b4244e

2017-05-25 03:28:15 +00:00

SetupEncryptionInterstitial.java

Use buttons for EncryptionInterstitial

2017-04-17 15:42:21 -07:00

SetupRedactionInterstitial.java

Disable SetupRedactionInterstitial when complete

2017-04-03 12:09:37 -07:00

SetupWizardUtils.java

Make GLIF v2 available to OEMs

2017-04-05 21:59:28 +00:00

ShowAdminSupportDetailsDialog.java

Specify disallowed action in AdminSupportDetailsDialog

2017-03-13 18:53:18 +01:00

SmsDefaultDialog.java

Don't show afw default app pref if there is no candidate.

2017-02-22 15:08:22 -08:00

SubSettings.java

…

SummaryPreference.java

Add ability to disable data warning.

2016-09-14 09:22:43 -07:00

TestingSettings.java

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

2017-01-18 19:28:11 +00:00

TestingSettingsBroadcastReceiver.java

Remove PreferenceActivity

2016-06-08 09:48:58 -04:00

TetherProvisioningActivity.java

…

TetherService.java

Remove hotspot receiver from manifest.

2017-04-11 12:03:54 -07:00

TetherSettings.java

Tether screen cleanup

2017-05-24 19:59:15 +00:00

TimeoutListPreference.java

Update the timeout list dialog in display and security settings.

2016-03-09 16:19:37 +00:00

TintablePreference.java

Create Advanced battery page

2017-02-06 13:44:59 -08:00

TouchBlockingFrameLayout.java

…

TrustAgentSettings.java

Refactored TrustAgentUtils to allow agent check injection.

2017-01-19 12:39:38 -08:00

TrustAgentUtils.java

Refactored TrustAgentUtils to allow agent check injection.

2017-01-19 12:39:38 -08:00

TrustedCredentialsDialogBuilder.java

Enable the switch in TrustedCredentialsSettings

2016-09-02 11:03:32 +01:00

TrustedCredentialsSettings.java

Remove ParcelableString references

2017-02-20 21:02:45 +00:00

UsageStatsActivity.java

Fix sort orders on longs.

2016-06-07 00:02:42 -07:00

UserCredentialsSettings.java

UserCredentialsSettings: that fresh new blank look

2017-03-24 14:57:13 +00:00

UserDictionarySettings.java

Log source with visibility change

2017-02-15 17:17:19 -08:00

Utils.java

Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential

2017-05-30 18:25:18 -07:00

WifiCallingSettings.java

Show aditional WiFi calling message.

2017-05-22 15:46:31 +00:00

WorkOnlyCategory.java

Rearrange configure/default apps

2016-02-24 08:55:01 -05:00