Kenny Root 9ceeeb6c02 resolve merge conflicts of bdc6074276 to master. ...

Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359

2016-01-21 19:30:35 -08:00

..

accessibility

Merge "Add padlocks to more preferences that can be disabled by policy."

2016-01-19 17:58:27 +00:00

accounts

Merge "Add padlocks to preferences that can be disabled by policy."

2016-01-21 19:07:02 +00:00

applications

Trigger a support dialog when an action is disabled by policy

2016-01-20 21:00:44 +00:00

backup

Depend on support lib preferences

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

bluetooth

Summary support for Settings Home

2015-11-17 13:51:45 -05:00

dashboard

Work mode conditional switch in main settings

2016-01-19 17:41:36 +00:00

datausage

Protect against missing subscriptions

2016-01-21 09:43:35 -05:00

deviceinfo

Add padlock to usb modes when disabled by admin.

2016-01-21 18:41:05 +00:00

display

Accomodating multiple preview screen with ViewPager for the users to

2016-01-14 22:50:54 -08:00

drawable

Refactor UidDetailProvider and its dependencies to SettingsLib.

2015-08-25 11:02:59 -07:00

fingerprint

Fixes alignment for fingerprint animation during setup.

2016-01-14 16:30:49 -08:00

fuelgauge

Add bt traffic accounting

2016-01-18 18:39:47 -08:00

inputmethod

Implement multiple locales and sublocales in Settings

2016-01-20 12:31:11 -08:00

localepicker

Implement multiple locales and sublocales in Settings

2016-01-20 12:31:11 -08:00

location

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

2016-01-19 16:56:58 +00:00

nfc

Add padlocks to preferences that can be disabled by policy.

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

notification

Merge "Add padlocks to preferences that can be disabled by policy."

2016-01-21 19:07:02 +00:00

print

Small corrections to the code that generates the print summary in the settings.

2016-01-07 14:22:20 -08:00

search

Update data usage UX

2016-01-19 13:55:26 -05:00

sim

Make phone number in Sim Settings read properly in Talk back mode.

2015-11-12 15:59:54 -08:00

tts

Depend on support lib preferences

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

users

Add padlocks to preferences that can be disabled by policy.

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

utils

Depend on support lib preferences

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

voice

Depend on support lib preferences

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

vpn2

Show app VPNs in always-on list

2016-01-14 17:17:52 +00:00

wfd

Depend on support lib preferences

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

widget

Merge "Update data usage UX"

2016-01-19 19:03:19 +00:00

wifi

Merge "[WifiDialog] Suppress activity transition"

2016-01-19 17:42:25 +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

ActiveNetworkScorerDialog.java

Cleanup remaining USER_OWNER in Settings

2015-09-03 10:31:34 -07:00

ActivityPicker.java

Depend on support lib preferences

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

AirplaneModeEnabler.java

Depend on support lib preferences

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

Validate the uri received in ApnEditor.

2015-10-28 20:45:25 +00:00

ApnPreference.java

Depend on support lib preferences

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

ApnSettings.java

am 7b990298: am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev

2015-10-14 23:54:00 +00:00

AppHeader.java

Update data usage UX

2016-01-19 13:55:26 -05:00

ApplicationSettings.java

Depend on support lib preferences

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

AppListPreference.java

Allow users to choose a notification assistant.

2016-01-04 16:36:56 -05: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

…

BandMode.java

Depend on support lib preferences

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

BrightnessPreference.java

Depend on support lib preferences

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

BugreportPreference.java

Adjusting call to AMN#requestBugReport()

2016-01-08 17:46:26 +00:00

ButtonBarHandler.java

…

CancellablePreference.java

Depend on support lib preferences

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

CheckableLinearLayout.java

…

ChooseLockGeneric.java

Fix build.

2016-01-21 14:15:46 -05:00

ChooseLockPassword.java

Update Work Challenge check to take userId

2016-01-13 10:27:13 +00:00

ChooseLockPattern.java

Update Work Challenge check to take userId

2016-01-13 10:27:13 +00:00

ChooseLockSettingsHelper.java

Work Profile Passphrase Setting

2016-01-11 10:30:18 +00:00

ColorModePreference.java

Depend on support lib preferences

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

ConfirmDeviceCredentialActivity.java

Fire pending intent from Confirm Credentials flow

2015-12-15 10:45:48 +00:00

ConfirmDeviceCredentialBaseActivity.java

Add timeout if we dont get onEnterAnimationComplete

2015-09-11 14:02:45 -07:00

ConfirmDeviceCredentialBaseFragment.java

Launch existing Task when taskId is given to ConfirmDeviceCredential

2016-01-05 16:26:10 +00:00

ConfirmLockPassword.java

Fire pending intent from Confirm Credentials flow

2015-12-15 10:45:48 +00:00

ConfirmLockPattern.java

Fire pending intent from Confirm Credentials flow

2015-12-15 10:45:48 +00:00

CopyablePreference.java

Depend on support lib preferences

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

CreateShortcut.java

First pass at drawer to Settings

2015-11-04 11:11:25 -05:00

CredentialCheckResultTracker.java

Fix crash in when restoring CredentialCheckResultTracker Fragment

2015-09-10 13:35:04 -07:00

CredentialStorage.java

resolve merge conflicts of bdc6074276 to master.

2016-01-21 19:30:35 -08:00

CryptKeeper.java

Fix no keyboard on N builds

2015-12-15 02:33:27 +00:00

CryptKeeperConfirm.java

Depend on support lib preferences

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

CryptKeeperSettings.java

Depend on support lib preferences

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

CustomDialogPreference.java

Fix crash language & input settings

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

CustomEditTextPreference.java

Depend on support lib preferences

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

CustomListPreference.java

Allow users to choose a notification assistant.

2016-01-04 16:36:56 -05:00

DateTimeSettings.java

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

2016-01-19 16:56:58 +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

Track ro.flash.locked bit to enable/disable OEM unlocking pref

2016-01-21 08:30:31 -08:00

DeviceAdminAdd.java

Add support messages to device admin pages.

2016-01-06 17:21:45 +00:00

DeviceAdminSettings.java

Merge "Follow PackageManager refactoring."

2016-01-06 22:26:15 +00:00

DeviceInfoSettings.java

Trigger a support dialog when an action is disabled by policy

2016-01-20 21:00:44 +00:00

DialogCreatable.java

…

DimmableIconPreference.java

Add padlocks to preferences that can be disabled by policy.

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

Display.java

…

DisplaySettings.java

Move DropDownPreference to supportlib

2015-12-15 10:59:08 -05:00

DreamSettings.java

Depend on support lib preferences

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

EditPinPreference.java

Depend on support lib preferences

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

EncryptionInterstitial.java

[ScreenLock] Fix result code handling

2015-12-15 11:56:45 -08:00

EventLogTags.logtags

…

FallbackHome.java

Gracefully handle slowly appearing Home apps.

2015-12-18 18:40:33 -07:00

HelpUtils.java

Start all help intents as startActivityForResult

2015-06-16 10:31:38 -04:00

HomeSettings.java

First pass at drawer to Settings

2015-11-04 11:11:25 -05:00

HotspotOffReceiver.java

Fix IndexOutOfBoundsException while silent provisioning check

2015-09-14 16:04:52 -07:00

IccLockSettings.java

Depend on support lib preferences

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

IconPreferenceScreen.java

Depend on support lib preferences

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

InstrumentedActivity.java

Depend on support lib preferences

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

InstrumentedFragment.java

Implement multiple locales and sublocales in Settings

2016-01-20 12:31:11 -08:00

InstrumentedPreferenceActivity.java

Depend on support lib preferences

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

InstrumentedPreferenceFragment.java

Depend on support lib preferences

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

LegalSettings.java

Depend on support lib preferences

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

LinkifyUtils.java

…

ManagedProfileSetup.java

Depend on support lib preferences

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

ManualDisplayActivity.java

Allow manual to be read from disk

2015-08-17 18:20:37 -07:00

MasterClear.java

Depend on support lib preferences

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

MasterClearConfirm.java

resolve merge conflicts of 7285e2c2fc to master.

2015-11-18 09:13:31 -08:00

MonitoringCertInfoActivity.java

Use explicit APIs to get device owner information

2015-11-24 14:55:26 -08:00

OwnerInfoSettings.java

Remove char limit from owner info

2015-06-29 15:42:41 -04:00

PinnedHeaderListFragment.java

…

PointerSpeedPreference.java

Fix crash language & input settings

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

PreferenceActivity.java

Depend on support lib preferences

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

PreviewPagerAdapter.java

Accomodating multiple preview screen with ViewPager for the users to

2016-01-14 22:50:54 -08:00

PreviewSeekBarPreferenceFragment.java

Add dot page indicator to preview screen pager.

2016-01-15 10:48:04 -08:00

PrivacySettings.java

Add padlocks to preferences that can be disabled by policy.

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

ProfileChallengePreferenceFragment.java

Fix bugs around unification when no password is set

2016-01-21 15:27:38 +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

Depend on support lib preferences

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

RadioInfo.java

Enhancement+Cleanup of RadioInfo Test Menu

2015-12-04 10:06:56 -08:00

RegulatoryInfoDisplayActivity.java

…

ResetNetwork.java

Depend on support lib preferences

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

ResetNetworkConfirm.java

Add IMS settings to Network setting reset am: 623852f6c7 am: c46bbd6373

2015-12-07 23:48:09 +00:00

RestrictedRadioButton.java

Add restricted padlocks to radio buttons.

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

RestrictedSettingsFragment.java

…

RingtonePreference.java

Depend on support lib preferences

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

SaveChosenLockWorkerBase.java

Update Work Challenge check to take userId

2016-01-13 10:27:13 +00:00

ScreenPinningSettings.java

Depend on support lib preferences

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

SecuritySettings.java

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

2016-01-19 16:56:58 +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

SetFullBackupPassword.java

…

Settings.java

Allow users to choose a notification assistant.

2016-01-04 16:36:56 -05:00

SettingsActivity.java

Implement multiple locales and sublocales in Settings

2016-01-20 12:31:11 -08:00

SettingsLicenseActivity.java

…

SettingsPreferenceFragment.java

Update data usage UX

2016-01-19 13:55:26 -05:00

SetupChooseLockGeneric.java

Allows the user to go back to Encryption Screen

2015-12-10 09:32:44 -08:00

SetupChooseLockPassword.java

Depend on support lib preferences

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

SetupChooseLockPattern.java

Refactor Choose/Confirm Lock flow to take user id

2015-10-16 11:47:18 +01:00

SetupEncryptionInterstitial.java

Allows the user to go back to Encryption Screen

2015-12-10 09:32:44 -08:00

SetupRedactionInterstitial.java

Enforce Keyguard policy in Notification Settings

2015-06-18 16:00:16 +01:00

SetupWizardUtils.java

[WifiDialog] Theme for setup wizard

2015-11-06 12:07:32 -08:00

ShowAdminSupportDetailsDialog.java

Check for MANAGE_DEVICE_ADMINS permission instead of uids.

2016-01-18 20:15:40 +00:00

SingleLineSummaryPreference.java

Depend on support lib preferences

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

SmsDefaultDialog.java

…

SubSettings.java

…

SummaryPreference.java

Update data usage UX

2016-01-19 13:55:26 -05:00

TestingSettings.java

Depend on support lib preferences

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

TestingSettingsBroadcastReceiver.java

Depend on support lib preferences

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

TetherService.java

Fix IndexOutOfBoundsException while silent provisioning check

2015-09-14 16:04:52 -07:00

TetherSettings.java

Depend on support lib preferences

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

TintablePreference.java

Depend on support lib preferences

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

TouchBlockingFrameLayout.java

Adding settings screen for font size. Also factored out common

2016-01-11 12:57:00 -08:00

TrustAgentSettings.java

Depend on support lib preferences

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

TrustAgentUtils.java

…

TrustedCredentialsSettings.java

Depend on support lib preferences

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

UsageStatsActivity.java

Depend on support lib preferences

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

UserCredentialsSettings.java

Depend on support lib preferences

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

UserDictionarySettings.java

Depend on support lib preferences

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

Utils.java

Update data usage UX

2016-01-19 13:55:26 -05:00

VoiceInputOutputSettings.java

Depend on support lib preferences

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

WallpaperTypeSettings.java

Adding the activity icon in wallpaper list

2015-11-24 14:11:30 -08:00

WarnedListPreference.java

Depend on support lib preferences

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

WifiCallingSettings.java

resolve merge conflicts of 5a1e5edeb7 to master.

2016-01-12 14:39:42 -08:00

WirelessSettings.java

Add padlocks to preferences that can be disabled by policy.

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

ZonePicker.java

Depend on support lib preferences

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