Jim Miller 5d9782a993 Merge "Fix 3402408: Manage "continue" button in ConfirmPassword screen"

2011-04-26 15:19:03 -07:00

..

accounts

Tolerate missing AccountManager resource, not just missing resource name

2011-04-07 11:58:39 -07:00

applications

DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter

2011-03-11 19:19:27 -05:00

bluetooth

Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

2011-03-28 20:25:23 -07:00

deviceinfo

Fix crash if no external storage.

2011-04-20 10:19:05 -07:00

fuelgauge

A few tweaks to the battery history chart.

2011-04-13 18:22:37 -07:00

inputmethod

Fix a bug which can't enable mutiple non-preinstalled IMEs at a time

2011-02-16 19:04:29 +09:00

nfc

Update Settings for new NfcAdapter.getDefaultAdapter(Context)

2010-12-09 19:39:58 -08:00

quicklaunch

Show quick launch settings always.

2010-12-08 17:12:11 -08:00

vpn

Don't check states when mActiveProfile is present

2011-03-06 01:53:45 +08:00

widget

Refactor Bluetooth settings for readability and performance.

2011-03-01 18:44:36 -08:00

wifi

am cb84ad52: am 1ad4824d: am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".

2011-03-08 18:39:59 -08:00

AccessibilitySettings.java

Adding system wide long press timeout configurability under accessibility.

2011-03-02 14:02:23 -08:00

AccountPreference.java

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

ActivityPicker.java

…

AirplaneModeEnabler.java

Update airplane mode checkbox when toggled from system bar.

2011-01-26 09:56:44 -08:00

ApnEditor.java

resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp

2011-03-04 14:49:40 -08:00

ApnPreference.java

…

ApnSettings.java

…

ApplicationSettings.java

advanced settings

2011-04-06 18:26:20 -07:00

AppWidgetPickActivity.java

…

BandMode.java

…

BatteryInfo.java

Support showing "Cold" battery health.

2010-09-20 18:02:28 +02:00

BrightnessPreference.java

Track changes to brightness and orientation lock in Settings.

2011-02-28 17:27:04 -08:00

ButtonBarHandler.java

Add WifiPickerActivity for PICK_WIFI_NETWORK

2011-01-17 13:26:45 -08:00

ChooseLockGeneric.java

Maintain password quality while encrypted

2011-01-21 16:25:22 -08:00

ChooseLockPassword.java

Fix 4283049: Restore continue/cancel buttons in LockScreen Settings

2011-04-15 18:52:31 -07:00

ChooseLockPattern.java

Fix 3409373: Don't grey out Cancel button on confirm pattern screen

2011-02-14 17:07:22 -08:00

ChooseLockPatternTutorial.java

Fix 3361307: Disable activity transition in pattern tutorial

2011-02-14 17:43:02 -08:00

ChooseLockSettingsHelper.java

Fragmentize "Factory reset" setting screen.

2010-11-03 12:04:16 -07:00

ConfirmLockPassword.java

Fix 3402408: Manage "continue" button in ConfirmPassword screen

2011-04-18 18:18:13 -07:00

ConfirmLockPattern.java

Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]

2011-01-09 13:57:53 -08:00

CreateShortcut.java

Move icons to mipmap.

2010-11-23 12:03:43 -08:00

CredentialStorage.java

Extract credential storage dialogs to a new activity.

2011-01-20 19:45:04 +08:00

CryptKeeper.java

Partial fix for Bug 3495575.

2011-03-01 10:17:57 -06:00

CryptKeeperConfirm.java

Remove logging of the password.

2011-03-15 15:24:16 -05:00

CryptKeeperSettings.java

Prevent NPE in onActivityResult

2011-02-01 16:22:41 -08:00

DateTimeSettings.java

Remove more entries not relevant to wifi-only devices.

2011-03-01 12:03:24 -08:00

DateTimeSettingsSetupWizard.java

Stop using Switch.

2011-03-11 12:14:48 -08:00

DebugIntentSender.java

…

DefaultRingtonePreference.java

Remove the deprecated things from Config.java. These havent been working since before 1.0.

2011-04-07 18:41:13 -07:00

DevelopmentSettings.java

Bug 4167061 remove debug code

2011-04-13 11:19:58 -07:00

DeviceAdminAdd.java

Cherry-pick from master: Fix issue #3324032:

2011-03-04 17:34:13 -08:00

DeviceAdminSettings.java

Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.

2011-01-24 16:24:55 -08:00

DeviceInfoSettings.java

Remove more entries not relevant to wifi-only devices.

2011-03-01 12:03:24 -08:00

DialogCreatable.java

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

Display.java

…

DisplaySettings.java

Fix possible NPE when Screen settings is launched quickly in succession.

2011-03-11 13:55:29 -08:00

DockSettings.java

Enable reverse tethering in BT settings screen.

2010-12-22 14:54:33 -08:00

EditPinPreference.java

…

GoogleLocationSettingHelper.java

Add 'Use My Location for Google services'.

2010-10-22 12:24:02 +01:00

IccLockSettings.java

…

IconPreferenceScreen.java

Refactor settings top level activities to use fragments.

2010-08-18 22:59:33 -07:00

LocalePicker.java

Reflects framework change.

2010-09-15 08:42:29 -07:00

MasterClear.java

Don't show separate option for erasing USB storage

2011-01-18 15:14:32 -08:00

MasterClearConfirm.java

Fragmentize "Factory reset" setting screen.

2010-11-03 12:04:16 -07:00

MediaFormat.java

Implement issue #3094621 and #3094609 - wipe sd card

2010-10-16 16:27:25 -07:00

OwnerInfoSettings.java

Fix 3201870: Move OwnerInfo settings to Location&Security.

2010-11-30 20:21:42 -08:00

PrivacySettings.java

Fix bug #2987804 (Provide a better UI for selecting the Backup account)

2011-01-12 13:37:40 -08:00

ProgressCategory.java

Add modifications which should have been in the change

2010-09-01 19:38:23 -07:00

ProgressCategoryBase.java

Add Wifi Setup screen for Setup Wizard with XL size screen.

2010-09-01 16:17:51 -07:00

ProxySelector.java

Fix ANR with bypass proxy regex

2011-03-22 17:57:44 -07:00

RadioInfo.java

Remove getCurrentDataConnectionList.

2011-04-20 10:24:36 -07:00

RingerVolumePreference.java

Fix 3419077: implement new volume control in Settings.

2011-02-03 18:20:23 -08:00

SecuritySettings.java

Remove / re-word some settings for WiFi-only devices.

2011-02-24 10:53:29 -08:00

Settings.java

Update to follow API change.

2011-03-18 12:29:41 -07:00

SettingsLicenseActivity.java

Remove the deprecated things from Config.java. These havent been working since before 1.0.

2011-04-07 18:41:13 -07:00

SettingsPreferenceFragment.java

Fix crash after adding a word to the user dictionary.

2011-01-31 12:46:57 -08:00

SettingsSafetyLegalActivity.java

Fix window leak problems in settings.

2010-07-14 11:10:00 +02:00

SoundSettings.java

Have SecuritySettings and SoundSettings use getCurrentPhoneType

2011-02-02 11:30:25 -08:00

SubSettings.java

Whoops forgot to add this file.

2011-03-15 17:24:29 -07:00

TestingSettings.java

…

TestingSettingsBroadcastReceiver.java

Remove the deprecated things from Config.java. These havent been working since before 1.0.

2011-04-07 18:41:13 -07:00

TetherSettings.java

Improve Bluetooth tethering UI usability.

2011-03-09 14:56:56 -08:00

TextToSpeechSettings.java

Fix TTS engine checkbox click handler

2011-04-19 14:37:49 +01:00

UsageStats.java

Disabled verbose logging

2010-06-05 14:42:00 +02:00

UserDictionarySettings.java

Directly show edit dialog when a user dictionary word is selected.

2010-11-02 11:31:56 -07:00

Utils.java

Remove more entries not relevant to wifi-only devices.

2011-03-01 12:03:24 -08:00

VoiceInputOutputSettings.java

Move Voice input/output settings to Language & keyboard

2010-12-10 13:20:52 -08:00

WirelessSettings.java

Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

2011-03-28 20:25:23 -07:00

ZonePicker.java

Refresh layouts for SetupWizard.

2010-12-28 12:06:08 -08:00