Phil Weaver 2e2dbfe549 Manual merge of ag/2319717 ...

Bug: 62104030
Test: Manually tested as described in original commit msg.
Change-Id: Ie00bafa736c837881a258c9de10891b27c5baefd

2017-05-30 10:41:52 -07:00

..

accessibility

Manual merge of ag/2319717

2017-05-30 10:41:52 -07:00

accounts

Clean up choose lock intent creation

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

applications

Correctly report whether the current app is default home.

2017-05-15 10:17:37 -07:00

backup

Add summary for Backup menu in Settings.

2017-04-27 22:33:52 +01:00

bluetooth

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

connecteddevice

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

core

Clean up choose lock intent creation

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

dashboard

Merge changes from topic 'footer-settingslib'

2017-05-12 20:24:05 +00:00

datausage

Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b

2017-05-12 15:51:11 -07: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

Clean up choose lock intent creation

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

deviceinfo

Clean up choose lock intent creation

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

display

Merge changes from topic 'footer-settingslib'

2017-05-12 20:24:05 +00: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

Clean up choose lock intent creation

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

fuelgauge

Merge changes from topic 'footer-settingslib'

2017-05-12 20:24:05 +00:00

gestures

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

inputmethod

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

language

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -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

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

nfc

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

notification

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

overlay

Add feature provider for Bluetooth

2017-05-08 16:06:42 -07:00

password

Clean up choose lock intent creation

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

print

Update summary for Connected devices->Printing.

2017-04-03 13:42:26 -07:00

qstile

Move developer options related class to development package

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

search

Merge "Remove accessibility duplicates in settings search" into oc-dev

2017-05-10 05:07:53 +00:00

search2

Merge "Fix crash when activity not attached after search index finishes." into oc-dev am: d3e33ebcef

2017-05-12 08:58:02 +00:00

security

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -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

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

trustagent

Refactored TrustAgentUtils to allow agent check injection.

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

tts

Save instance to avoid crash opon restore in onCreate.

2017-04-12 10:42:01 +01: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

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

wifi

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07: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

Merge "Change to not call update() if APN is not modified." into oc-dev

2017-05-02 01:59:38 +00:00

ApnPreference.java

Fix mvno match data is incorrect for APNs

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

ApnSettings.java

Properly index developer options.

2017-04-27 16:06:32 -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

…

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

Adding SecureTouchListener to DeviceAdminAdd

2017-05-04 18:50:33 -07:00

DeviceAdminSettings.java

Follow API removals.

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

DeviceInfoSettings.java

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

DialogCreatable.java

Log visibility change for DialogCreatable in Settings.

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

DimmableIconPreference.java

…

DisplaySettings.java

Merge changes from topic 'footer-settingslib'

2017-05-12 20:24:05 +00:00

DividerPreference.java

Allow settings preference title to span over multiple lines.

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

EditPinPreference.java

…

EncryptionAndCredential.java

Update metrics constant for Encryption & credentials.

2017-02-23 10:57:19 -08: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

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

2017-01-18 19:28:11 +00: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

Clean up choose lock intent creation

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

MasterClearConfirm.java

Use the new OemLockService to get OEM lock state.

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

MonitoringCertInfoActivity.java

…

MultiLinePreference.java

…

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

…

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

…

RemoteBugreportActivity.java

…

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

…

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

Clean up choose lock intent creation

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

SeekBarDialogPreference.java

…

SeekBarPreference.java

Add color temperature preference to Night Display

2017-03-20 15:47:41 +00:00

SelectableEditTextPreference.java

…

SelfAvailablePreference.java

…

SetFullBackupPassword.java

…

Settings.java

Clean up choose lock intent creation

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

SettingsActivity.java

Prevent race conditions after dropping database

2017-05-08 18:48:04 +00:00

SettingsDumpService.java

Dump the default broswer in SettingsDumpService

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

SettingsInitialize.java

Update WebView implementation Dev Setting - new looks + descriptions.

2017-01-23 18:34:11 +00:00

SettingsLicenseActivity.java

Generate license html file from xml files of partitions

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

SettingsPreferenceFragment.java

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07: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

…

TetherProvisioningActivity.java

…

TetherService.java

Remove hotspot receiver from manifest.

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

TetherSettings.java

Tether screen cleanup

2017-05-04 18:37:04 +00:00

TimeoutListPreference.java

…

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

…

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

Manual merge of ag/2319717

2017-05-30 10:41:52 -07:00

WifiCallingSettings.java

Merge "WiFiCallingSettings: don't start carrier app in onResume" am: 05c88316ec am: e21cbcb6b4

2017-02-27 18:34:34 +00:00

WorkOnlyCategory.java

…