Alexey Polyudov f689441eed fix the build breakage caused by merge resolution ...

commit 5d409ace19 broke the build

Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit 8c041f7862)

2017-02-02 21:58:36 +00:00

..

accessibility

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

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

accounts

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

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

applications

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

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

backup

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

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

bluetooth

fix the build breakage caused by merge resolution

2017-02-02 21:58:36 +00:00

dashboard

Add SuggestionFeatureProvider interface.

2017-01-21 19:50:22 +00:00

datausage

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

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

deletionhelper

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

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

deviceinfo

Refactor setCurrentFunction and setUsbDataUnlocked into one method

2017-01-24 13:27:14 -08:00

display

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

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

drawable

…

fingerprint

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

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

fuelgauge

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

2017-01-18 20:24:36 +00:00

gestures

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

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

inputmethod

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

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

localepicker

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

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

location

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

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

nfc

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

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

notification

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

2017-01-18 20:24:36 +00:00

overlay

Fix null pointer exception when surveys are turned off

2017-01-27 10:29:10 -08:00

password

DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD

2016-12-12 02:35:42 +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

Developer QS tile: GPU Profiling.

2016-04-24 10:55:41 -04:00

search

Handle SubSettings instance leaks in Index.java

2016-12-28 09:18:15 +08:00

sim

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

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

support

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

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

tts

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

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

users

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

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

utils

Fix crash when opening account sync detail for external app

2016-10-31 21:57:36 +00:00

voice

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

vpn2

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

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

wfd

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

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

widget

DO NOT MERGE - Require password to FR in carrier demo mode

2017-02-01 09:37:28 -08:00

wifi

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

2017-01-18 20:24:36 +00:00

AccessiblePreferenceCategory.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AccountPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

ActivityPicker.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

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

When Airplane mode is changed due to Voice Intent, use the system

2015-12-11 11:56:50 -08:00

AllowBindAppWidgetActivity.java

…

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

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

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

Link to external settings activity from the app header.

2016-01-29 10:15:31 -05:00

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

Use app name as summary in default home app setting.

2016-07-12 12:51:31 -07:00

AppListPreferenceWithSettings.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AppListSwitchPreference.java

Support changes in support prefs for DeviceDefault themes

2015-11-12 10:09:10 -05:00

AppPicker.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AppProgressPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AppWidgetLoader.java

…

AppWidgetPickActivity.java

…

BackupSettingsActivity.java

Tell sublaunched backup settings activities about policy state

2016-09-21 17:16:17 -07:00

BandMode.java

Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List

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

BrightnessPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

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

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

CheckableLinearLayout.java

…

ChooseLockGeneric.java

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

2017-01-18 20:24:36 +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

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

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

ConfirmDeviceCredentialBaseActivity.java

Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation

2016-05-24 15:57:23 +01:00

ConfirmDeviceCredentialBaseFragment.java

Remove duplicated call to authenticationSucceeded()

2016-08-10 10:59:57 +01: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

Enhanced notification details.

2016-02-22 12:52:38 -05:00

CreateShortcut.java

Revert "Add shortcut manager support to Settings (2/2) b/28298258"

2016-05-10 17:16:33 +00:00

CredentialCheckResultTracker.java

Clear mHasResult if the result is dispatched

2016-03-18 18:44:57 +00:00

CredentialStorage.java

Clear VPN after Clear credentials if VPN is being established

2017-01-18 10:44:57 +09:00

CryptKeeper.java

Show signal strength indication while in CryptKeeper

2016-05-03 16:39:11 -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

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

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

CustomDialogPreference.java

Clean up CellDataPreference dialog problems

2016-01-28 13:10:24 -05:00

CustomEditTextPreference.java

Add dev options to set swXdp

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

CustomListPreference.java

Warn users when selecting non-Direct Boot apps.

2016-07-27 14:49:34 -06:00

DateTimeSettings.java

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

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

DateTimeSettingsSetupWizard.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

DefaultRingtonePreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

DevelopmentSettings.java

Add missing null pointer check for Bluetooth A2DP Codec Settings

2017-02-01 17:43:23 -08:00

DeviceAdminAdd.java

Don't allow removing admin to be added again

2016-04-15 01:14:55 +00:00

DeviceAdminSettings.java

Fixes back button on action bar on some fragments.

2016-03-29 10:29:14 -07: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

…

DimmableIconPreference.java

Add preference summary when disabled by admin.

2016-01-25 22:39:34 +00:00

Display.java

Remove ActivityManagerNative dependency for adjusting font scale

2016-02-01 18:42:56 -08:00

DisplaySettings.java

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

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

DividedCategory.java

Add moar dividers

2016-04-04 13:20:59 -04:00

DividerPreference.java

Restore the premiume SMS Preference.

2016-04-08 13:02:48 -04: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

Fix sim pin settings

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

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

Add "Uninstall" button to device admin activation dialog.

2016-01-25 14:09:24 -08:00

FallbackHome.java

Show progress user unlocking is delayed

2016-08-02 20:02:42 +02:00

GearPreference.java

Block "Screen lock" menu if password is managed.

2016-03-02 18:08:42 +01: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

Allow TetherService to take a callback to receiver provision results.

2016-01-25 15:09:48 -08: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

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

InstrumentedActivity.java

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

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

InstrumentedFragment.java

Merge "Remove fake data" into nyc-mr2-dev

2017-01-27 20:31:40 +00:00

InstrumentedPreferenceFragment.java

Fix null pointer exception when surveys are turned off

2017-01-27 10:29:10 -08:00

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

Teach settings about PASSWORD_QUALITY_MANAGED constant

2016-04-07 10:44:35 -07:00

ManualDisplayActivity.java

…

MasterClear.java

DO NOT MERGE - Require password to FR in carrier demo mode

2017-02-01 09:37:28 -08:00

MasterClearConfirm.java

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

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

Fixes back button on action bar on some fragments.

2016-03-29 10:29:14 -07:00

OwnerInfoSettings.java

Move lock screen setting behind gear

2016-01-28 15:40:50 -08:00

PinnedHeaderListFragment.java

…

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

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

ProgressCategoryBase.java

Depend on support lib preferences

2015-10-13 10:12:20 -04: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

[DO NOT MERGE] Use new QueuedWork interface.

2017-01-31 02:51:04 +00: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

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

Add restricted padlocks to radio buttons.

2016-01-20 16:26:56 +00:00

RestrictedSettingsFragment.java

Avoid triggering device admin settings in non-current user.

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

RingtonePreference.java

Fix ringtone persistance after device rotation.

2016-04-04 15:20:11 -04:00

SaveChosenLockWorkerBase.java

Keymaster init for work profile

2016-04-07 14:23:55 +00:00

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

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

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

SeekBarDialogPreference.java

Fix crash language & input settings

2015-10-13 16:45:49 -04:00

SeekBarPreference.java

Add padlocks to preferences that can be disabled by policy.

2016-01-20 17:48:27 +00:00

SelectableEditTextPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

SelfAvailablePreference.java

Rearrange configure/default apps

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

SetFullBackupPassword.java

…

Settings.java

Add storage manager settings activity.

2016-09-22 17:43:42 -07:00

SettingsActivity.java

DO NOT MERGE - Allow FR in carrier demo mode

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

SettingsDumpService.java

Make cell data usage an array

2016-02-03 13:13:15 -05:00

SettingsInitialize.java

Disable WebViewSetting for non-admin users.

2016-05-12 11:13:26 +01:00

SettingsLicenseActivity.java

System paths are okay now; no more special-casing.

2016-02-01 10:40:05 -07:00

SettingsPreferenceFragment.java

Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d

2016-10-13 01:34:08 +00:00

SetupChooseLockGeneric.java

[SetupWizard] Fix talkback on lock screen.

2016-06-16 14:42:22 -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

GLIF theme for settings

2016-04-26 17:20:31 -07:00

SharedPreferencesLogger.java

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

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

ShowAdminSupportDetailsDialog.java

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

2016-08-02 16:34:00 +01:00

SingleLineSummaryPreference.java

Add padlocks to more preferences that can be disabled by admin.

2016-02-03 00:24:52 +00:00

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

Make TetherSettings use the new tether api.

2016-02-04 18:58:14 -08:00

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

Update the timeout list dialog in display and security settings.

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

TintablePreference.java

Make battery settings use new battery graph.

2016-02-18 14:12:32 -05:00

TouchBlockingFrameLayout.java

Reject all touch events in TouchBlockingFrameLayout

2016-02-05 16:13:27 -05:00

TrustAgentSettings.java

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

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

TrustAgentUtils.java

Add padlocks to more preferences that can be disabled by admin.

2016-02-03 00:24:52 +00:00

TrustedCredentialsDialogBuilder.java

Show different strings when PO/DO user approves a cert

2016-05-31 22:43:09 +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

Depend on support lib preferences

2015-10-13 10:12:20 -04: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

More theming fixes.

2016-05-25 10:55:11 -07:00

Utils.java

DO NOT MERGE - Require password to FR in carrier demo mode

2017-02-01 09:37:28 -08:00

VoiceInputOutputSettings.java

Depend on support lib preferences

2015-10-13 10:12:20 -04: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

WarnedListPreference.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

WebViewImplementation.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

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

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

WorkOnlyCategory.java

Rearrange configure/default apps

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

ZonePicker.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00