Philip P. Moltmann 5a9deda72f resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp ...

am: afe6320d70

Change-Id: I514cc08bef8ef2b76d90628ae3b21833d3bda206

2017-02-14 18:27:10 +00:00

..

accessibility

Optimize a11y service capabilities

2017-01-31 13:20:53 -08:00

accounts

Merge "Change "Long pressing work mode in quick settings" to managed profile settings"

2017-02-14 11:14:13 +00:00

applications

Merge "Add BatteryMeterView in Settings"

2017-02-13 20:45:17 +00:00

backup

Enable the backup settings activity before launching

2017-02-03 19:01:26 +00:00

bluetooth

[DO NOT MERGE] Revert "[DO NOT MERGE] Use new QueuedWork interface."

2017-02-13 23:44:55 +00:00

connecteddevice

Update Network & internet->Wi-Fi to use MasterSwitchPreference.

2017-01-25 10:43:01 -08:00

core

Merge "Have WebView Implementation Dev Setting use DefaultAppPickerFragment."

2017-02-09 17:36:33 +00:00

dashboard

Add logging for settings

2017-02-13 16:57:28 -08:00

datausage

Use consistent formatter to convert byte->MB->GB.

2017-01-24 11:50:27 -08:00

datetime

Enable time zone preference on wifi-only device.

2017-01-13 11:15:13 -08:00

deletionhelper

Remove Downloads backup options.

2017-02-07 16:57:04 -08:00

development

Add check for DISALLOW_DEBUGGING_FEATURES restriction

2016-12-09 11:38:22 -08:00

deviceinfo

Update storage setting summary text format.

2017-02-09 17:08:34 -08:00

display

Merge "Add Adaptive brightness as an inline result in Search"

2017-02-07 20:12:37 +00:00

enterprise

Add admin-set default apps to Enterprise Privacy Settings page

2017-01-25 02:31:23 +01:00

fingerprint

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

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

fuelgauge

Merge "Add BatteryMeterView in Settings"

2017-02-13 20:45:17 +00:00

gestures

Remove getCategoryKey() from DashboardFragment children.

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

inputmethod

Combine Language & region and Input & gestures in System settings.

2017-02-06 11:46:48 -08:00

language

Combine Language & region and Input & gestures in System settings.

2017-02-06 11:46:48 -08:00

localepicker

Updating CreateShortcut activity to use the new ShortcutManager APIs

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

location

Move intent action to xml

2017-01-27 11:05:27 -08:00

network

Display current vpn for Vpn preference summary text

2017-02-13 13:22:48 -08:00

nfc

Implements queryNonIndexableKeys for Settings

2017-01-25 14:33:45 -08:00

notification

Merge "Link back to app settings from channel page"

2017-02-10 16:05:11 +00:00

overlay

Create Advanced battery page

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

password

Use Activity.getActivityToken to align with mr2

2016-12-14 02:57:14 +00:00

print

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

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

qstile

Removing one all-purpose developer tile and replacing it with 4 separate tiles,

2017-02-08 10:13:25 -08:00

search

Merge "Create Advanced battery page"

2017-02-08 20:33:35 +00:00

search2

Sync search result loaders

2017-02-10 10:10:55 -08:00

security

Merge "Consider res package when updating security icons."

2017-01-20 01:01:19 +00:00

sim

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

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

suggestions

Adding setting suggestion ranker.

2017-01-26 14:45:39 -08:00

support

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

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

survey

Added survey support to second fragment type

2017-01-31 11:43:07 -08:00

system

Update top level menu items summary text.

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

trustagent

Refactored TrustAgentUtils to allow agent check injection.

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

tts

Move settings to their new location according to ux spec.

2017-01-25 18:30:06 +00:00

users

Update top level menu items summary text.

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

utils

Update package names to work with the proto3 compiler

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

voice

…

vpn2

Move GearPreference to widget package.

2017-02-08 16:09:12 -08:00

webview

Have WebView Implementation Dev Setting use DefaultAppPickerFragment.

2017-02-09 10:17:17 +00:00

wfd

Add summary provider for Cast Setting (WifiDisplaySettings)

2017-02-07 12:05:29 -08:00

widget

Convert auto-fill default selector to full screen pattern.

2017-02-09 12:45:53 -08:00

wifi

Hide "Use network recommendations" in Settings.

2017-02-08 13:42:19 -08: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

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

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

ApnPreference.java

…

ApnSettings.java

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

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

AppHeader.java

…

ApplicationSettings.java

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

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

AppListPreference.java

Add autofill app preference to Default Apps.

2017-01-24 21:51:54 -08:00

AppListPreferenceWithSettings.java

Convert auto-fill default selector to full screen pattern.

2017-02-09 12:45:53 -08:00

AppPicker.java

…

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

…

ChooseLockGeneric.java

Deprecate old LockPatternUtils.clearLock()

2017-02-01 14:15:06 +00:00

ChooseLockPassword.java

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

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

ChooseLockPattern.java

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

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

ChooseLockSettingsHelper.java

Fix Continous loop in unifed screenlock when trying to Trust a CA cert

2016-05-20 19:10:33 +01:00

ColorModePreference.java

Color transforms are now color modes.

2016-07-13 22:12:33 -07:00

ConfirmDeviceCredentialActivity.java

Eliminate useless 'isManagedProfile' utils method

2016-09-12 16:25:28 +09:00

ConfirmDeviceCredentialBaseActivity.java

Eliminate useless 'isManagedProfile' utils method

2016-09-12 16:25:28 +09:00

ConfirmDeviceCredentialBaseFragment.java

CredentialFragment anti-pocket dialing measures.

2017-02-11 19:49:02 +00:00

ConfirmLockPassword.java

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

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

ConfirmLockPattern.java

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

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

CopyablePreference.java

…

CreateShortcut.java

Add logging for settings

2017-02-13 16:57:28 -08:00

CredentialCheckResultTracker.java

…

CredentialStorage.java

resolve merge conflicts of cb1968148a to master

2017-01-19 23:58:30 +00:00

CryptKeeper.java

Replace deprecated ACTION_MASTER_CLEAR by ACTION_FACTORY_RESET.

2017-02-13 16:02:13 +01: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

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

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

Prompt credentials for installing/deleting sounds

2017-02-10 15:34:53 +00:00

DevelopmentSettings.java

Merge "Add null pointer checks when updating A2DP configuration values" am: 6f7437580c am: bd3f96703c am: fae23e1e00

2017-02-11 01:34:12 +00:00

DeviceAdminAdd.java

Add policy transparency to Settings > device administrators

2017-01-26 12:55:50 +00:00

DeviceAdminSettings.java

Update package names to work with the proto3 compiler

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

DeviceInfoSettings.java

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

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

DialogCreatable.java

Log visibility change for DialogCreatable in Settings.

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

DimmableIconPreference.java

…

DisplaySettings.java

Update top level menu items summary text.

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

DividedCategory.java

…

DividerPreference.java

Populate Enterprise Privacy Settings page - batch 1

2016-11-18 14:17:47 +01:00

DreamSettings.java

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

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

EditPinPreference.java

…

EncryptionInterstitial.java

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

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

EventLogTags.logtags

…

FallbackHome.java

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

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

HelpTrampoline.java

Offer trampoline to help articles.

2016-07-25 16:45:15 -06:00

HomeSettings.java

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

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

HotspotOffReceiver.java

…

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

LinkifyUtils.java

…

ManagedLockPasswordProvider.java

…

ManualDisplayActivity.java

…

MasterClear.java

Require password to FR in carrier demo mode

2017-02-08 07:44:57 -08:00

MasterClearConfirm.java

Replace deprecated ACTION_MASTER_CLEAR by ACTION_FACTORY_RESET.

2017-02-13 16:02:13 +01:00

MonitoringCertInfoActivity.java

Show different strings when PO/DO user approves a cert

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

MultiLinePreference.java

…

OptionsMenuFragment.java

Add InstrumentFragment for non-PreferenceFragment types.

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

OwnerInfoSettings.java

Update package names to work with the proto3 compiler

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

PointerSpeedPreference.java

Fix crash on rotate pointer speed

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

PreviewPagerAdapter.java

Inflate necessary previews upon user interaction instead of

2016-08-25 07:39:08 +00:00

PreviewSeekBarPreferenceFragment.java

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

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

PrivacySettings.java

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

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

resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp

2017-02-14 18:27:10 +00:00

RegulatoryInfoDisplayActivity.java

Add safety & regulatory info to "about device".

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

RemoteBugreportActivity.java

…

ResetNetwork.java

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

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

ResetNetworkConfirm.java

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

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

Avoid triggering device admin settings in non-current user.

2016-06-02 12:40:22 -07:00

RingtonePreference.java

…

SaveChosenLockWorkerBase.java

…

ScreenPinningSettings.java

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

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

SecuritySettings.java

Update top level menu items summary text.

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

SeekBarDialogPreference.java

…

SeekBarPreference.java

Align seek bar type preferences to reserve icon space

2016-12-27 10:30:01 -08:00

SelectableEditTextPreference.java

…

SelfAvailablePreference.java

…

SetFullBackupPassword.java

…

Settings.java

Merge "Have WebView Implementation Dev Setting use DefaultAppPickerFragment."

2017-02-09 17:36:33 +00:00

SettingsActivity.java

Add logging for settings

2017-02-13 16:57:28 -08: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

…

SettingsPreferenceFragment.java

Full screen default app fragment

2017-01-23 16:08:42 -08:00

SetupChooseLockGeneric.java

Can launch into the lock screen with setup wizard style

2016-11-02 11:49:09 -07:00

SetupChooseLockPassword.java

Use GLIF theme for Settings > Security > Screen lock

2016-06-16 12:13:11 -07:00

SetupChooseLockPattern.java

Use GLIF theme for Settings > Security > Screen lock

2016-06-16 12:13:11 -07:00

SetupEncryptionInterstitial.java

Use GLIF theme for Settings > Security > Screen lock

2016-06-16 12:13:11 -07:00

SetupRedactionInterstitial.java

Use GLIF theme for Settings > Security > Screen lock

2016-06-16 12:13:11 -07:00

SetupWizardUtils.java

Remove WifiSetupActivity

2016-12-14 22:41:58 +00:00

ShowAdminSupportDetailsDialog.java

Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog

2016-08-08 15:25:31 +00:00

SingleLineSummaryPreference.java

…

SmsDefaultDialog.java

Application names are now lazily loaded

2016-07-15 17:32:02 +00: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

Do not use TetherUtil.setWifiTethering

2016-08-26 13:26:45 -07:00

TetherSettings.java

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

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

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

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

UsageStatsActivity.java

Fix sort orders on longs.

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

UserCredentialsSettings.java

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

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

UserDictionarySettings.java

Update package names to work with the proto3 compiler

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

Utils.java

Prompt credentials for installing/deleting sounds

2017-02-10 15:34:53 +00:00

WallpaperSuggestionActivity.java

Changing the WallpaperSuggestionActivity to redirect to the actual

2016-06-14 09:44:10 -07:00

WallpaperTypeSettings.java

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

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

WifiCallingSettings.java

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

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

WirelessSettings.java

Display carrier network name as celluar setting summary.

2017-02-13 13:22:43 -08:00

WorkOnlyCategory.java

…

ZonePicker.java

Fix TTS for GMT offset

2016-11-17 16:30:05 -08:00