Lucky Zhang 64192c36fa am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev ...

automerge: a4df967

* commit 'a4df9673896bf7fb317b8ae92246b555d712a79d':
  [FRP] Remove None and Swipe from screen lock options

2014-12-09 23:15:29 +00:00

..

accessibility

am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

2014-10-17 23:14:01 +00:00

accounts

Merge "Modify account settings for better locale resolution" into lmp-mr1-dev

2014-12-03 12:15:39 +00:00

applications

Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev

2014-11-07 19:13:27 +00:00

bluetooth

Check remote device uuids for phone book access permission

2014-11-26 13:32:48 -08:00

dashboard

Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted

2014-11-06 17:36:28 -08:00

deviceinfo

Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev

2014-12-05 19:25:59 +00:00

drawable

Switch to using system-wide default user icons

2014-09-12 17:00:40 +01:00

fuelgauge

am f29bc1df: am 45893e65: Settings: Don\'t lose the switch bar returning to saver settings.

2014-12-03 20:53:57 +00:00

inputmethod

Update synonyms and fix some issues related to them

2014-11-06 16:57:04 -08:00

location

Use correct API for badging

2014-09-07 15:38:09 -07:00

net

Apply predefined icon and label to managed profiles

2014-10-31 12:03:53 +00:00

nfc

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

notification

Settings: Improve inline volume sliders.

2014-12-01 11:58:25 -05:00

print

am c5aa905a: Merge "IllegalStateException fixed in print service settings"

2014-11-25 23:23:16 +00:00

quicklaunch

More fixes for QuickLaunchSettings

2014-07-24 15:46:35 -07:00

search

am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev

2014-10-23 22:10:38 +00:00

sim

Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev

2014-12-05 20:55:29 +00:00

tts

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

users

Fix padding in user type selection dialog

2014-12-03 14:20:05 -08:00

voice

Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button

2014-11-10 16:35:06 -08:00

vpn2

Restore legacy VPN stats dialog.

2014-08-22 13:12:01 -07:00

wfd

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

widget

[WifiSetup] Add shadow below header

2014-08-29 15:17:42 -07:00

wifi

resolve merge conflicts of 0c7e4ed to master.

2014-12-09 15:11:44 -08:00

AccountPreference.java

Adds missing accessibility string for accounts syncing

2014-05-28 15:47:25 +01:00

ActiveNetworkScorerDialog.java

Don't allow secondary users to change Wi-Fi assistants.

2014-11-07 13:26:56 -08:00

ActivityPicker.java

Update Settings to use themed Context.getDrawable()

2014-10-10 10:58:58 -07:00

AirplaneModeEnabler.java

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

AirplaneModeVoiceActivity.java

Add voice-only settings activities for airplane mode.

2014-08-08 21:01:01 -07:00

AllowBindAppWidgetActivity.java

Add support for widgets in user profiles

2014-08-05 15:21:25 -07:00

ApnEditor.java

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

ApnPreference.java

Ensure recycled APN preferences are updated to show radio button

2014-10-01 12:43:10 -07:00

ApnSettings.java

Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity

2014-10-14 16:21:22 -07:00

ApplicationSettings.java

…

AppListPreference.java

Final UX for Wi-Fi assistant platform settings.

2014-11-14 15:27:21 -08:00

AppListSwitchPreference.java

Final UX for Wi-Fi assistant platform settings.

2014-11-14 15:27:21 -08:00

AppPicker.java

…

AppWidgetLoader.java

…

AppWidgetPickActivity.java

…

BandMode.java

…

BatteryInfo.java

…

BrightnessPreference.java

Use activity for brightness dialog

2014-07-14 15:07:34 -07:00

BugreportPreference.java

…

ButtonBarHandler.java

…

ChooseLockGeneric.java

[FRP] Remove None and Swipe from screen lock options

2014-12-05 18:50:55 -08:00

ChooseLockPassword.java

[FRP] Use setup wizard nav bar buttons

2014-12-04 12:20:47 -08:00

ChooseLockPattern.java

Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev

2014-12-05 18:25:59 +00:00

ChooseLockSettingsHelper.java

User to confirm credentials if an accessibility service changes encryption.

2014-10-16 17:35:07 -07:00

ConfirmDeviceCredentialActivity.java

User to confirm credentials if an accessibility service changes encryption.

2014-10-16 17:35:07 -07:00

ConfirmLockPassword.java

User to confirm credentials if an accessibility service changes encryption.

2014-10-16 17:35:07 -07:00

ConfirmLockPattern.java

Don't put credentials in results from externally accessible activities

2014-07-10 10:23:12 -07:00

CreateShortcut.java

…

CredentialStorage.java

Forward wifi cert install intents to primary user

2014-11-13 11:19:15 +00:00

CryptKeeper.java

Reduce number of attempts before factory reset to 30.

2014-11-21 09:44:09 +00:00

CryptKeeperConfirm.java

Make the system locale available to the decryption UI.

2014-09-26 15:17:35 -07:00

CryptKeeperSettings.java

Don't show a pattern-specific prompt at encryption time.

2014-11-05 00:43:33 +00:00

DataUsageSummary.java

Change initMobileTabTag to use subInfoList

2014-12-02 17:12:08 -08:00

DateTimeSettings.java

Remove vestigial "Choose date format" option.

2014-11-17 10:43:20 -08:00

DateTimeSettingsSetupWizard.java

…

DefaultRingtonePreference.java

…

DevelopmentSettings.java

am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

2014-11-24 18:12:16 +00:00

DeviceAdminAdd.java

Make sure profile owner is system app

2014-08-13 16:18:33 -07:00

DeviceAdminSettings.java

Update list on ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED

2014-12-02 17:24:13 -08:00

DeviceInfoSettings.java

Implement #15841213 Search - index Developer Option only and only if they have been activated

2014-07-25 16:28:53 -07:00

DialogCreatable.java

…

Display.java

…

DisplaySettings.java

Bring back auto-rotate to settings

2014-09-02 15:46:08 -04:00

DreamBackend.java

…

DreamSettings.java

Make the SwitchBar appear immediately

2014-06-12 11:13:23 -07:00

EditPinPreference.java

…

EnableWifiTether.java

Removing checks from EnableWifiTether which are done in SystemUI

2014-12-04 12:10:15 -08:00

EncryptionInterstitial.java

[FRP] Use Lock type as header instead of "Encryption"

2014-12-05 12:19:05 -08:00

EventLogTags.logtags

…

HelpUtils.java

…

HighlightingFragment.java

Improve Search results highlighting

2014-06-19 13:58:22 -07:00

HomeSettings.java

Update to use "real" L codename.

2014-10-08 15:48:25 -07:00

IccLockSettings.java

Changed SIM lock toggle to a switch

2014-11-23 17:19:49 -08:00

IconPreferenceScreen.java

…

LocalePicker.java

Settings psuedolocalization fixes.

2014-08-22 12:24:00 -07:00

ManagedProfileSetup.java

Switch to listening for USER_INITIALIZE broadcast in the Settings app.

2014-08-18 17:42:26 +01:00

MasterClear.java

Show account icons for managed profiles on Settings > Factory Reset

2014-12-02 17:22:10 +00:00

MasterClearConfirm.java

Include reason when wiping data.

2014-09-24 14:08:05 -07:00

MediaFormat.java

Don't show a pattern-specific prompt at encryption time.

2014-11-05 00:43:33 +00:00

MonitoringCertInfoActivity.java

…

NsdEnabler.java

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

OwnerInfoSettings.java

OwnerInfos code cleaning

2014-07-23 12:45:13 -07:00

PinnedHeaderListFragment.java

Add the capability to set a pinned header to a ListFragment

2014-07-21 17:25:42 -07:00

PointerSpeedPreference.java

…

PrivacySettings.java

Remove backup preferences if backup service is inactive

2014-11-20 20:20:49 +00:00

ProgressCategory.java

Fix ProgressCategory theming and layout

2014-06-17 14:20:09 -07:00

ProgressCategoryBase.java

Fix ProgressCategory theming and layout

2014-06-17 14:20:09 -07:00

ProxySelector.java

…

RadioInfo.java

Update class name for FdnList.

2014-10-31 13:21:57 -07:00

RegulatoryInfoDisplayActivity.java

Update Settings to use themed Context.getDrawable()

2014-10-10 10:58:58 -07:00

RestrictedSettingsFragment.java

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-15 19:00:35 -07:00

ScreenPinningSettings.java

Bring screen lock setting back to screen pinning

2014-10-31 15:45:12 -04:00

SecuritySettings.java

Additional changes to SubscriptionManager API as per API council.

2014-11-22 10:11:39 -08:00

SelectableEditTextPreference.java

…

SetFullBackupPassword.java

…

Settings.java

Fix bug #16703191 APN settings shows back button even when you intent into it

2014-08-15 11:36:31 -07:00

SettingsActivity.java

Modify account settings for better locale resolution

2014-12-03 10:50:54 +00:00

SettingsLicenseActivity.java

Migrate license display to HTMLViewer.

2014-11-14 09:46:33 -08:00

SettingsPreferenceFragment.java

Use correct list index for search highlighting

2014-09-08 12:40:59 -07:00

SetupChooseLockGeneric.java

[FRP] Remove None and Swipe from screen lock options

2014-12-05 18:50:55 -08:00

SetupChooseLockPassword.java

Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev

2014-12-05 03:21:53 +00:00

SetupChooseLockPattern.java

Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev

2014-12-05 03:21:53 +00:00

SetupEncryptionInterstitial.java

[FRP] Use Lock type as header instead of "Encryption"

2014-12-05 12:19:05 -08:00

SetupRedactionInterstitial.java

[FRP] Add illustration to lock screen setup

2014-12-03 21:19:21 -08:00

SetupWizardUtils.java

[FRP] Add illustration to lock screen setup

2014-12-03 21:19:21 -08:00

SmsDefaultDialog.java

…

SubSettings.java

…

TestingSettings.java

…

TestingSettingsBroadcastReceiver.java

…

TetherSettings.java

Migrate license display to HTMLViewer.

2014-11-14 09:46:33 -08:00

TrustAgentSettings.java

Use SwitchPreference in TrustAgentSettings.

2014-08-13 19:43:20 +00:00

TrustAgentUtils.java

Reenabling permission check for TrustAgent.

2014-06-19 08:34:18 -07:00

TrustedCredentialsSettings.java

Stop background processes if TrustedCredentialSettings fragment gets detached

2014-11-18 18:02:48 +00:00

UsageAccessSettings.java

Make UsageAccess WarningDialog actually instatiatable.

2014-09-09 11:34:55 -07:00

UsageStatsActivity.java

Update to use new UsageStats API

2014-08-07 21:30:52 -07:00

UserDictionarySettings.java

…

UserSpinnerAdapter.java

Update Settings to use themed Context.getDrawable()

2014-10-10 10:58:58 -07:00

Utils.java

Modify account settings for better locale resolution

2014-12-03 10:50:54 +00:00

VoiceInputOutputSettings.java

Unify voice interactor and recognizer settings.

2014-07-21 20:14:43 -07:00

VoiceSettingsActivity.java

Add voice-only settings activities for airplane mode.

2014-08-08 21:01:01 -07:00

WallpaperTypeSettings.java

…

WarnedListPreference.java

…

WirelessSettings.java

Don't show SMS app settings for restricted profiles

2014-11-12 15:35:17 -08:00

ZonePicker.java

…