Ricky Wai 16d93fbae4 Merge "Do not update unified setting before updating primary profile lock" into nyc-dev ...

am: 8e91558

* commit '8e91558c0a70a042e0fcbabb8e9c536c9f23b47f':
  Do not update unified setting before updating primary profile lock

Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d

2016-04-12 17:11:05 +00:00

..

accessibility

Add Tron Logging to portion of A11y SUW that lives in Settings.

2016-04-01 14:34:17 -07:00

accounts

Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev

2016-04-07 09:23:19 +00:00

applications

Settings dashboard performance work

2016-04-12 10:32:20 -04:00

backup

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

bluetooth

Fix localization issues with disabled

2016-04-11 09:58:55 -04:00

dashboard

Merge "Settings tweaks" into nyc-dev

2016-04-08 20:46:49 +00:00

datausage

Add moar dividers

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

deviceinfo

Guard against crash in SummaryProvider

2016-04-11 10:21:28 -04:00

display

Merge "Add dev options to set swXdp" into nyc-dev

2016-04-06 13:20:07 +00:00

drawable

Refactor UidDetailProvider and its dependencies to SettingsLib.

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

fingerprint

Merge "Moving HelpUtils to SettingsLib" into nyc-dev

2016-04-08 19:31:37 +00:00

fuelgauge

Merge "Fix battery history details" into nyc-dev

2016-04-11 18:58:25 +00:00

inputmethod

Merge "Add Keyboard Shortcuts Helper entry in Settings" into nyc-dev

2016-04-11 09:44:20 +00:00

localepicker

Fix locale reorder jank

2016-03-23 12:21:31 -07:00

location

Merge "Fix no options menu on location settings screen"

2016-03-23 16:07:28 +00:00

nfc

Moving HelpUtils to SettingsLib

2016-04-05 14:37:33 -07:00

notification

Merge "Allow user to hide sensitive notifications with no work challenge" into nyc-dev

2016-04-08 15:44:44 +00:00

print

Use changed getStatus interface

2016-03-24 16:53:44 -07:00

search

Make Print Settings use the new PrintManager.getPrintServices loader

2016-03-07 09:32:55 -08:00

sim

Fix UI issue in Sim Settings screen.

2016-04-07 09:43:03 -07:00

tts

Add a pitch seekbar for TTS speech output.

2016-03-09 18:20:19 +00:00

users

Merge "Fix user photo popup layout for RTL" into nyc-dev

2016-04-07 00:56:04 +00:00

utils

Add settings VR listener service.

2016-03-04 16:07:09 -08:00

voice

Depend on support lib preferences

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

vpn2

Show notification when failing to turn on always-on vpn

2016-03-31 16:40:22 +01:00

wfd

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

widget

Fix EBT helper initialization in LabeledSeekBar class

2016-04-08 18:37:21 -07:00

wifi

Fix localization issues with disabled

2016-04-11 09:58:55 -04: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

port settings over to new metrics enum

2016-01-27 10:58:58 -05: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

MVNO value is not grayed out when MVNO type is none

2016-04-01 18:57:22 +00:00

ApnPreference.java

Depend on support lib preferences

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

ApnSettings.java

Fix crash in ApnSettings.

2016-03-24 15:39:24 -07:00

AppHeader.java

Link to external settings activity from the app header.

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

ApplicationSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

AppListPreference.java

Add indicator for system dialer in Settings

2016-03-18 16:49:16 -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

…

BandMode.java

Update BandMode Names to support full list, fix off-by-one UI error.

2016-02-17 00:51:20 +00:00

BrightnessPreference.java

Depend on support lib preferences

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

BugreportPreference.java

Makes call to MetricsLogger right away when taking bugreports.

2016-02-25 11:37:56 -08:00

ButtonBarHandler.java

…

CancellablePreference.java

Depend on support lib preferences

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

CheckableLinearLayout.java

…

ChooseLockGeneric.java

Teach settings about PASSWORD_QUALITY_MANAGED constant

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

ChooseLockPassword.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

ChooseLockPattern.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

ChooseLockSettingsHelper.java

Teach settings about PASSWORD_QUALITY_MANAGED constant

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

ColorModePreference.java

Depend on support lib preferences

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

ConfirmDeviceCredentialActivity.java

Revert "Revert "Read default confirm credentials title from policy""

2016-02-02 15:10:27 +00:00

ConfirmDeviceCredentialBaseActivity.java

Fix crash in ConfirmDeviceCredentials

2016-03-29 18:34:53 -07:00

ConfirmDeviceCredentialBaseFragment.java

Hint user that fingerprint cannot unlock FBE keys

2016-04-08 15:23:46 +01:00

ConfirmLockPassword.java

Hint user that fingerprint cannot unlock FBE keys

2016-04-08 15:23:46 +01:00

ConfirmLockPattern.java

Hint user that fingerprint cannot unlock FBE keys

2016-04-08 15:23:46 +01:00

CopyablePreference.java

Enhanced notification details.

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

CreateShortcut.java

Remove TetherUtil functions which are no longer needed.

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

CredentialCheckResultTracker.java

Clear mHasResult if the result is dispatched

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

CredentialStorage.java

Merge "Added getProfileIds method returning array of userIds" into nyc-dev

2016-04-11 16:40:54 +00:00

CryptKeeper.java

Revert "Fix no keyboard on N builds"

2016-04-01 17:20:37 -07:00

CryptKeeperConfirm.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

CryptKeeperSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05: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

Add setting to allow RemoteInput on keyguard

2016-02-25 09:22:14 -08:00

DateTimeSettings.java

Fix date and time and apn editing

2016-02-17 17:28:46 -05: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

Remove OpenGL traces from dev settings

2016-04-11 10:17:53 -04:00

DeviceAdminAdd.java

Use DPM.uninstallPackageWithActiveAdmins()

2016-02-10 16:23:43 -08:00

DeviceAdminSettings.java

Fixes back button on action bar on some fragments.

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

DeviceInfoSettings.java

Prevents users from being added if device is not provisioned

2016-03-25 13:33:57 -07: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

Improved UX when DISALLOW_SET_WALLPAPER is set.

2016-04-08 11:32:48 +02: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

Fix dream settings initial state.

2016-01-30 12:15:11 -05:00

EditPinPreference.java

Fix sim pin settings

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

EncryptionInterstitial.java

Mark UI components for tests to find.

2016-04-01 23:18:11 -06:00

EventLogTags.logtags

Add "Uninstall" button to device admin activation dialog.

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

FallbackHome.java

Gracefully handle slowly appearing Home apps.

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

GearPreference.java

Block "Screen lock" menu if password is managed.

2016-03-02 18:08:42 +01:00

HomeSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

HotspotOffReceiver.java

Allow TetherService to take a callback to receiver provision results.

2016-01-25 15:09:48 -08:00

IccLockSettings.java

Fix sim pin settings

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

IconPreferenceScreen.java

Depend on support lib preferences

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

InstrumentedActivity.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

InstrumentedFragment.java

Fix sim pin settings

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

InstrumentedPreferenceActivity.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

InstrumentedPreferenceFragment.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

LegalSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

LinkifyUtils.java

…

ManagedLockPasswordProvider.java

Teach settings about PASSWORD_QUALITY_MANAGED constant

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

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

Fixes back button on action bar on some fragments.

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

MasterClearConfirm.java

Merge "Prevents users from being added if device is not provisioned" into nyc-dev

2016-03-31 20:13:40 +00:00

MonitoringCertInfoActivity.java

Use explicit APIs to get device owner information

2015-11-24 14:55:26 -08: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 language & input settings

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

PreferenceActivity.java

Fix sim pin settings

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

PreviewPagerAdapter.java

Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev

2016-04-06 17:47:09 +00:00

PreviewSeekBarPreferenceFragment.java

Stops black screen from being displayed on changing Vision Settings in SUW.

2016-03-18 10:18:36 -07:00

PrivacySettings.java

Don't crash if the backup transport supplies bogus intents

2016-03-16 13:45:03 -07: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

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

RadioInfo.java

Cleanup RadioInfo Test Menu

2016-04-11 15:31:59 -07:00

RegulatoryInfoDisplayActivity.java

…

RemoteBugreportActivity.java

New activity for handling dialogs of remote bugreports

2016-03-03 17:06:05 +00:00

ResetNetwork.java

Fixes back button on action bar on some fragments.

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

ResetNetworkConfirm.java

Fixes back button on action bar on some fragments.

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

RestrictedListPreference.java

Avoid checking the restricted items in the list.

2016-03-04 13:53:24 -08:00

RestrictedRadioButton.java

Add restricted padlocks to radio buttons.

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

RestrictedSettingsFragment.java

Show "no vpns added" for empty vpn screen

2016-03-16 20:28:52 +00: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

Teach settings about PASSWORD_QUALITY_MANAGED constant

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

SecuritySettings.java

Do not update unified setting before updating primary profile lock

2016-04-12 17:34:59 +01: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

Fix Settings activity typo.

2016-04-07 22:08:09 -07:00

SettingsActivity.java

Fix Settings activity typo.

2016-04-07 22:08:09 -07:00

SettingsDumpService.java

Make cell data usage an array

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

SettingsLicenseActivity.java

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

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

SettingsPreferenceFragment.java

Moving HelpUtils to SettingsLib

2016-04-05 14:37:33 -07:00

SetupChooseLockGeneric.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

SetupChooseLockPassword.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

SetupChooseLockPattern.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

SetupEncryptionInterstitial.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

SetupRedactionInterstitial.java

Fixes graybar as status bar and unshifts header view.

2016-03-30 15:25:59 -07:00

SetupWizardUtils.java

[WifiDialog] Theme for setup wizard

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

SharedPreferencesLogger.java

Move temporary metrics constants to proto

2016-03-08 14:18:30 -05:00

ShowAdminSupportDetailsDialog.java

Update the admin app icon in the support dialog.

2016-02-22 22:39:26 +00:00

SingleLineSummaryPreference.java

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

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

SmsDefaultDialog.java

Move Home settings to Default apps

2016-01-26 09:44:39 -05:00

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

TetherProvisioningActivity.java

Make TetherSettings use the new tether api.

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

TetherService.java

Remove PM query for silent provisioning BroadcastReceiver.

2016-02-09 23:28:47 +00:00

TetherSettings.java

Make sure mWifiManager gets initialized

2016-03-09 10:49:33 -05: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

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

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

TrustAgentUtils.java

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

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

TrustedCredentialsSettings.java

Merge "Add button to trust a CA cert" into nyc-dev

2016-04-06 10:59:20 +00:00

UsageStatsActivity.java

Depend on support lib preferences

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

UserCredentialsSettings.java

Guard double-showing of user credentials dialog

2016-04-07 13:20:21 +01:00

UserDictionarySettings.java

Depend on support lib preferences

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

Utils.java

Added getProfileIds method returning array of userIds

2016-04-07 16:46:18 -07:00

VoiceInputOutputSettings.java

Depend on support lib preferences

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

WallpaperTypeSettings.java

port settings over to new metrics enum

2016-01-27 10:58:58 -05:00

WarnedListPreference.java

Depend on support lib preferences

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

WifiCallingSettings.java

Adding "wifi only" option for wifi calling.

2016-04-01 08:41:18 -07:00

WirelessSettings.java

Part3 - Don't add padlock if the restriction is not set by admin.

2016-02-16 11:04: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