jackqdyulei 8ce27bc37c resolve merge conflicts of 758b2d4ae6 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53

2017-06-26 18:30:40 -07:00

..

accessibility

Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev

2017-06-22 14:17:37 +00:00

accounts

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

applications

resolve merge conflicts of 31a2f413f8 to master

2017-06-26 15:04:15 -07:00

backup

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

bluetooth

Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316

2017-06-26 14:28:10 -07:00

connecteddevice

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

core

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

dashboard

Merge "Dashboard search bar polish"

2017-06-27 00:11:59 +00:00

datausage

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

datetime

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

deletionhelper

Use the config default days to retain.

2017-05-23 16:05:15 -07:00

development

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

deviceinfo

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

display

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

dream

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

enterprise

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

fingerprint

Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev

2017-06-22 19:58:51 +00:00

fuelgauge

resolve merge conflicts of 758b2d4ae6 to master

2017-06-26 18:30:40 -07:00

gestures

Remove unnecessary functions from AssistGestureFeatureProvider

2017-06-26 16:58:43 -07:00

graph

Implement general projection curve support for UsageGraph.

2017-06-08 16:59:14 +00:00

inputmethod

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

language

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

localepicker

Updating CreateShortcut activity to use the new ShortcutManager APIs

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

location

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

network

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

nfc

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

notification

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

overlay

Use support feature provider to provide intro url.

2017-06-08 23:34:35 +00:00

password

Add fingerprint backup message

2017-06-23 11:33:41 -07: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 "Fix typo in metrics constants"

2017-06-26 21:06:48 +00:00

security

Make PreferenceController a mixin

2017-06-26 10:58:36 -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

Add a flag to enable/disable new device suggestion

2017-06-22 20:03:09 +00:00

survey

Depend on SettingsLib's version of lifecycle and FooterMixin.

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

system

Make PreferenceController a mixin

2017-06-26 10:58:36 -07: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

Disable managed services special access screens...

2017-06-23 15:44:43 -04: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

Use SettingsLib's versions of Custom* classes.

2017-06-21 12:07:50 -07:00

wifi

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

AccessiblePreferenceCategory.java

…

ActivityPicker.java

ActivityPicker shouldn't grant permissions.

2017-06-12 18:11:41 -06: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

…

AllowBindAppWidgetActivity.java

Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am: c7697e9b8a am: 933cdd5503

2017-06-03 22:24:50 +00:00

ApnEditor.java

Check for null mReadOnlyApnTypes.

2017-06-01 16:39:40 -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

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

ButtonBarHandler.java

…

CancellablePreference.java

…

CheckableLinearLayout.java

…

CreateShortcut.java

Change MaskableBitmap to AdaptiveBitmap

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

CredentialStorage.java

Prevent showing multiple keyguard dialog in vpn setup UI

2017-06-05 17:42:53 -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

CustomListPreference.java

Update package names to work with the proto3 compiler

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

DateTimeSettings.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07: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

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

DialogCreatable.java

Log visibility change for DialogCreatable in Settings.

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

DimmableIconPreference.java

…

DisplaySettings.java

Make PreferenceController a mixin

2017-06-26 10:58:36 -07:00

DividerPreference.java

Allow settings preference title to span over multiple lines.

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

EditPinPreference.java

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

EncryptionAndCredential.java

Add help url placeholders for new pages

2017-06-05 14:50:01 -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

Catch invalid extra when launching help trampoline.

2017-06-22 10:34:07 -07:00

HotspotOffReceiver.java

Remove hotspot receiver from manifest.

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

IccLockSettings.java

Add help url placeholder for SimLock settings

2017-06-19 21:11:48 +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

…

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

Load regulatory info from /data/misc

2017-06-22 20:13:21 +00:00

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

Add help url placeholders for new pages

2017-06-05 14:50:01 -07:00

SecuritySettings.java

Remove duplicates in Security Settings

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

SeekBarDialogPreference.java

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

SelectableEditTextPreference.java

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

SelfAvailablePreference.java

…

SetFullBackupPassword.java

…

Settings.java

Disable managed services special access screens...

2017-06-23 15:44:43 -04:00

SettingsActivity.java

Dashboard search bar polish

2017-06-26 10:08:44 -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

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -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

Read setup wizard theme from system properties

2017-06-20 00:25:50 +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

Refactor hotspot into a full page

2017-06-14 12:32:44 -07:00

TimeoutListPreference.java

…

TintablePreference.java

Create Advanced battery page

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

TouchBlockingFrameLayout.java

…

TrustAgentSettings.java

Add help url placeholders for new pages

2017-06-05 14:50:01 -07: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

Merge "Switch Utils.formatElapsedTime to use ICU's MeasureFormat"

2017-06-22 19:49:35 +00:00

WifiCallingSettings.java

Show aditional WiFi calling message.

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

WorkOnlyCategory.java

…