Colin Cross dab025bdff resolved conflicts for merge of 769ba03b to master ...

Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b

2015-07-23 21:43:07 -07:00

..

accessibility

Ensure "default" and "none" caption colors are consistent w/ framework

2015-06-22 13:05:45 -07:00

accounts

Talkback improvements for Settings screens.

2015-07-09 13:21:20 -04:00

applications

am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev

2015-07-21 18:06:42 +00:00

backup

show old legal text in backup settings if full data backup is disabled

2015-06-15 18:11:41 -07:00

bluetooth

Device Discoverability not set properly when Bluetooth is toggled

2015-07-01 01:35:29 +00:00

dashboard

import new view enums into MetricsLogger

2015-07-10 17:19:58 -04:00

deviceinfo

Merge "Turn the eject menu into a button."

2015-07-21 06:14:37 +00:00

drawable

Remove frame and shadow from CircleFramedDrawable

2014-12-18 12:10:16 +00:00

fingerprint

Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mnc-dev

2015-07-21 23:39:35 +00:00

fuelgauge

Update FakeUid to implement new method defined in BatteryStats.Uid

2015-06-30 16:58:08 -07:00

inputmethod

Dont crash if there is no spellchecker

2015-06-26 18:15:13 -07:00

location

Use DimmableIconPreference for Add user action

2015-05-19 16:44:13 -07:00

net

Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.

2015-07-13 12:01:42 -07:00

nfc

Fix up Tap and Pay how it works.

2015-07-10 15:43:25 +02:00

notification

[ScreenLock] Change title for RedactionInterstitial

2015-07-20 23:42:52 +00:00

print

Set service name to printer service setting title

2015-06-22 13:43:49 -07:00

search

Implement default assist app setting

2015-06-10 08:43:28 -07:00

sim

Fix SimPreference dialog from closing on orientation change.

2015-06-10 17:46:31 -07:00

tts

log visibility of views

2015-03-27 13:39:07 -04:00

users

sys user split: update createUser method

2015-07-16 14:34:00 -07:00

utils

Fix TTS for Zen mode voice activity.

2015-05-24 12:30:21 -07:00

voice

Disable voice input if assist is voice service

2015-07-14 04:13:57 +00:00

vpn2

Merge "Match getLegacyVpn calls to changed interface" into mnc-dev

2015-07-10 19:05:41 +00:00

wfd

log visibility of views

2015-03-27 13:39:07 -04:00

widget

am 96b09cf5: am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev

2015-06-16 05:16:43 +00:00

wifi

Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev

2015-07-14 22:29:32 +00:00

AccessiblePreferenceCategory.java

Talkback improvements for Settings screens.

2015-07-09 13:21:20 -04:00

AccountPreference.java

Fix some dark theme issues (Take 2)

2015-06-04 14:16:10 -04: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

log more settings actions

2015-05-08 18:48:24 -04:00

AirplaneModeVoiceActivity.java

Add activities to support voice settings.

2015-04-13 14:38:51 -07:00

AllowBindAppWidgetActivity.java

Add support for widgets in user profiles

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

ApnEditor.java

Fix bug to force to close once change Bearer on APN

2015-07-20 17:09:42 -07:00

ApnPreference.java

Ensure recycled APN preferences are updated to show radio button

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

ApnSettings.java

Don't allow secondary users apps to start restricted Settings fragment.

2015-06-02 16:49:20 -07:00

AppHeader.java

Fix app headers in settings

2015-05-06 16:00:25 -04:00

ApplicationSettings.java

log visibility of views

2015-03-27 13:39:07 -04:00

AppListPreference.java

Implement default assist app setting

2015-06-10 08:43:28 -07:00

AppListPreferenceWithSettings.java

Implement default assist app setting

2015-06-10 08:43:28 -07:00

AppListSwitchPreference.java

Final UX for Wi-Fi assistant platform settings.

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

AppPicker.java

Layout refinement for app lists

2015-06-16 09:15:39 -04:00

AppProgressPreference.java

Layout refinement for app lists

2015-06-16 09:15:39 -04:00

AppWidgetLoader.java

…

AppWidgetPickActivity.java

…

BandMode.java

Fix the crash of BandMode app.

2014-04-26 00:15:59 +00:00

BrightnessPreference.java

Use activity for brightness dialog

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

BugreportPreference.java

…

ButtonBarHandler.java

…

CancellablePreference.java

Move process stats screen into memory screen.

2015-04-27 10:08:52 -04:00

CheckableLinearLayout.java

New dialog for ignore battery optimizations

2015-06-10 15:49:36 -04:00

ChooseLockGeneric.java

[Fingerprint] Change message in encryption

2015-07-20 21:52:12 +00:00

ChooseLockPassword.java

Enforce Keyguard policy in Notification Settings

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

ChooseLockPattern.java

Always announcing wrong pattern now for talkback in pattern settings

2015-06-25 18:12:26 -04:00

ChooseLockSettingsHelper.java

[Fingerprint] Change message in encryption

2015-07-20 21:52:12 +00:00

ConfirmDeviceCredentialActivity.java

Don't launch ConfirmDeviceCredentials multiple times.

2015-07-20 22:38:02 +00:00

ConfirmDeviceCredentialBaseActivity.java

Animations/success state for external confirm device credentials (2/2)

2015-06-10 15:17:24 -07:00

ConfirmDeviceCredentialBaseFragment.java

Prevent crash when removing an account.

2015-07-10 10:07:21 -04:00

ConfirmLockPassword.java

Talkback improvements for Settings screens.

2015-07-09 13:21:20 -04:00

ConfirmLockPattern.java

Talkback improvements for Settings screens.

2015-07-09 13:21:20 -04:00

CreateShortcut.java

Update for shortcuts

2015-06-16 16:31:01 -04:00

CredentialStorage.java

Check signature match between Cert installer and Settings

2015-07-09 18:16:27 +01:00

CryptKeeper.java

Disable back button on crypto screen

2015-05-27 20:34:14 +00:00

CryptKeeperConfirm.java

Honor password visible setting in CryptKeeper

2015-05-27 20:33:46 +00:00

CryptKeeperSettings.java

Added support for DO_NOT_ASK_CREDENTIALS_ON_BOOT DPM flag

2015-04-29 02:53:53 +00:00

DataUsageSummary.java

Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib.

2015-07-13 12:01:42 -07:00

DateTimeSettings.java

Modifications for changes to SettingsLib

2015-06-09 10:10:56 +01:00

DateTimeSettingsSetupWizard.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

DefaultRingtonePreference.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

DevelopmentSettings.java

resolved conflicts for merge of 769ba03b to master

2015-07-23 21:43:07 -07:00

DeviceAdminAdd.java

Hide the collapse/expand icon if text fits the screen

2015-05-29 11:21:42 -07:00

DeviceAdminSettings.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

DeviceInfoSettings.java

Check new user restriction.

2015-06-15 21:51:16 -07:00

DialogCreatable.java

…

DimmableIconPreference.java

Use DimmableIconPreference for Add user action

2015-05-19 16:44:13 -07:00

Display.java

…

DisplaySettings.java

Hide tap to wake on devices that don't support it

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

DreamBackend.java

…

DreamSettings.java

log visibility of views

2015-03-27 13:39:07 -04:00

DropDownPreference.java

Enforce Keyguard policy in Notification Settings

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

EditPinPreference.java

…

EncryptionInterstitial.java

[ScreenLock] Style encryption interstitial in SUW

2015-07-20 21:06:21 -07:00

EventLogTags.logtags

…

HelpUtils.java

Start all help intents as startActivityForResult

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

HighlightingFragment.java

log visibility of views

2015-03-27 13:39:07 -04:00

HomeSettings.java

log visibility of views

2015-03-27 13:39:07 -04:00

HotspotOffReceiver.java

Move some Tethering code to SettingsLib to share

2015-02-12 10:33:40 -05:00

IccLockSettings.java

Correct the way settings deals with subscriptions.

2015-04-08 11:11:34 -07:00

IconPreferenceScreen.java

…

InstrumentedFragment.java

import new view enums into MetricsLogger

2015-07-10 17:19:58 -04:00

InstrumentedPreferenceActivity.java

provide better instructions for adding settings views.

2015-04-02 09:38:41 -04:00

InstrumentedPreferenceFragment.java

provide better instructions for adding settings views.

2015-04-02 09:38:41 -04:00

LegalSettings.java

import new view enums into MetricsLogger

2015-07-10 17:19:58 -04:00

LinkifyUtils.java

Added links to scanning settings

2015-04-06 11:00:04 -07:00

LocalePicker.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

ManagedProfileSetup.java

Switch to listening for USER_INITIALIZE broadcast in the Settings app.

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

MasterClear.java

Talkback improvements for Settings screens.

2015-07-09 13:21:20 -04:00

MasterClearConfirm.java

Talkback improvements for Settings screens.

2015-07-09 13:21:20 -04: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

Remove char limit from owner info

2015-06-29 15:42:41 -04: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

Re-add a string which was accidently removed.

2015-06-03 17:01:42 -07:00

ProfileSelectDialog.java

Allow system apps to add to settings dashboard

2015-03-25 11:11:36 -04: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

log visibility of views

2015-03-27 13:39:07 -04:00

RadioInfo.java

Make Settings app not use cleartext network traffic.

2015-04-02 11:30:15 -07:00

RegulatoryInfoDisplayActivity.java

Update Settings to use themed Context.getDrawable()

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

ResetNetwork.java

Network Reset should have a lockdown like Factory Reset.

2015-06-01 16:30:48 +00:00

ResetNetworkConfirm.java

Network Reset should have a lockdown like Factory Reset.

2015-06-01 16:30:48 +00:00

RestrictedSettingsFragment.java

log visibility of views

2015-03-27 13:39:07 -04:00

ScreenPinningSettings.java

Screen pinning set default lock on exit value

2015-06-23 13:28:27 -04:00

SecuritySettings.java

Make 'fingerprint' searchable in Settings.

2015-07-21 14:28:40 +00:00

SelectableEditTextPreference.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

SetFullBackupPassword.java

…

Settings.java

Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an

2015-07-13 22:39:49 +01:00

SettingsActivity.java

Settings: Add widget entry point to magical entry points listing.

2015-06-19 10:47:36 -04:00

SettingsLicenseActivity.java

Migrate license display to HTMLViewer.

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

SettingsPreferenceFragment.java

Turn the eject menu into a button.

2015-07-17 15:26:15 +09:00

SetupChooseLockGeneric.java

[Fingerprint] Add fingerprint enroll in setup wizard

2015-07-15 11:14:22 -07:00

SetupChooseLockPassword.java

Enforce Keyguard policy in Notification Settings

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

SetupChooseLockPattern.java

Enforce Keyguard policy in Notification Settings

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

SetupEncryptionInterstitial.java

[ScreenLock] Style encryption interstitial in SUW

2015-07-20 21:06:21 -07:00

SetupRedactionInterstitial.java

Enforce Keyguard policy in Notification Settings

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

SetupWizardUtils.java

Merge "[Setup] Use SetupWizardLayout"

2015-04-22 17:36:50 +00:00

SingleLineSummaryPreference.java

Change owner info to be a dialog rather than screen

2015-04-22 11:14:14 -04:00

SmsDefaultDialog.java

Enhance change default SMS app dialog to show list of apps

2015-06-04 15:16:56 -07:00

SubSettings.java

…

TestingSettings.java

Remove phone information for a secondary user

2015-05-07 20:22:24 +02:00

TestingSettingsBroadcastReceiver.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

TetherService.java

Settings: Remove all unused imports.

2015-03-18 15:51:15 -04:00

TetherSettings.java

Don't allow secondary users apps to start restricted Settings fragment.

2015-06-02 16:49:20 -07:00

TintablePreference.java

Fix crash in battery screen

2015-06-04 10:52:01 -04:00

TrustAgentSettings.java

Show disabled trust agents as off.

2015-07-15 16:12:34 +00:00

TrustAgentUtils.java

Disable trust agent settings when disabled by policy

2015-04-13 17:14:41 -07:00

TrustedCredentialsSettings.java

log visibility of views

2015-03-27 13:39:07 -04:00

UsageStatsActivity.java

Update to use new UsageStats API

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

UserAdapter.java

Allow system apps to add to settings dashboard

2015-03-25 11:11:36 -04:00

UserDictionarySettings.java

…

Utils.java

Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

2015-07-16 16:07:12 -07:00

VoiceInputOutputSettings.java

Implement default assist app setting

2015-06-10 08:43:28 -07:00

WallpaperTypeSettings.java

Allow help to be defined to intent uri

2015-04-14 15:43:20 -04:00

WarnedListPreference.java

…

WifiCallingSettings.java

Log WiFi Calling actions from settings

2015-06-20 15:49:08 -07:00

WirelessSettings.java

Remove dead hidden ConnectivityManager and NetworkInfo APIs.

2015-06-11 10:26:33 -04:00

ZonePicker.java

Modifications for changes to SettingsLib

2015-06-09 10:10:56 +01:00