summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translationsKenny Root2010-04-2940-857/+545
| | | | Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
* Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into ↵Michael Chan2010-04-281-27/+26
|\ | | | | | | froyo
| * b/2630339 Fixed the crash when an app requests BT to be enabledMichael Chan2010-04-281-27/+26
| | | | | | | | | | | | | | | | For AlertActivity, the dialog needs to display at onCreate() time. Otherwise, the decor view would be made. Trying to display the dialog afterward would crash. Changed to AlertDialog instead. Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
* | Merge "Import revised translations" into froyoKenny Root2010-04-2841-685/+817
|\ \ | |/ |/|
| * Import revised translationsKenny Root2010-04-2841-685/+817
| | | | | | | | Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
* | Fix regression in removing settings that aren't relevant for a platform.Amith Yamasani2010-04-271-105/+87
|/ | | | | | | | | | | | | Bug: 2630695 The PreferenceCategories added into the hierarchy caused removePreference() to not work, since the preferences to be removed were not immediate children of the preference screen. Create empty PreferenceCategory elements and pull the preferences to the same depth as the categories. Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
* Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... ↵Michael Chan2010-04-231-25/+17
|\ | | | | | | after the user unpaired while docked." into froyo
| * b/2608693 Fix the problem where BT was automatically reconnectingMichael Chan2010-04-221-25/+17
| | | | | | | | | | | | ... after the user unpaired while docked. Change-Id: I65642f440109968387401fc3c103da0f2b15f49f
* | Fix string for uninstall button for system apps.Suchi Amalapurapu2010-04-221-4/+5
| | | | | | | | Change-Id: Iad26aae3d99447eddb6997e66c84080cdce727da
* | Enable moving packages when install location is set to auto.Suchi Amalapurapu2010-04-221-1/+2
| | | | | | | | Change-Id: If081ad949cb2aed6b3555275c582e951e579ffc9
* | Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-214-62/+107
|\ \
| * | Redesign vibration settings.Daniel Sandler2010-04-214-62/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the hood there remain three axes: 1. Are we in silent mode now? | RINGER_MODE_{VIBRATE,SILENT} 2. Do we vibrate in silent mode? | VIBRATE_IN_SILENT == 1 3. Do calls vibrate: | getVibrateSetting(VIBRATE_TYPE_RINGER) - always | == VIBRATE_SETTING_ON - never | == VIBRATE_SETTING_OFF - only in silent | == VIBRATE_SETTING_ONLY_SILENT We now expose this to the user much more simply by collapsing (2) and (3) above, and discarding states that don't make sense: - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT Now we offer the user four choices: Phone vibrate: * "Never" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF * "Always" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON * "Only in silent mode" --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT * "Only when not in silent mode" --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON This should make it easier to choose exactly the behavior the user wants as well as avoid nonsensical combinations of settings. Bug: 2598014 Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
* | | Merge "Labeled categories to help clarify Sound prefs." into froyoDaniel Sandler2010-04-212-0/+29
|\ \ \ | |/ / | | / | |/ |/|
| * Labeled categories to help clarify Sound prefs.Daniel Sandler2010-04-212-0/+29
| | | | | | | | | | Bug: 2598014 Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
* | Fix the tethering help page.Robert Greenwalt2010-04-191-3/+24
|/ | | | | | | | It worked with language+country resources but for some resources it's just language. Added a check to see if we had lanugage+country before deciding which to use. bug:2605981 Change-Id: Icb667a51f0c376f5188e3a43f264e236cd265468
* Merge "Stop scanning after errors" into froyoIrfan Sheriff2010-04-171-1/+4
|\
| * Stop scanning after errorsIrfan Sheriff2010-04-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scan fails for 3 times, we show a failure toast and continue to scan. In one case this caused infinite toasts, until the user stopped wifi. Its not clear what can cause this kind of a state since wifi disable broadcast should stop the scans. This fix will stop scans after 3 continuous failures. Any wifi state change will restart scan. Bug: 2601937 Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c
* | Set encoding for HTML assets to UTF-8Kenny Root2010-04-1566-0/+66
| | | | | | | | Change-Id: Ia6989e94efc93e359b4035a1e0a99ab9262b7424
* | Merge "Import revised translations" into froyoKenny Root2010-04-1523-871/+968
|\ \
| * | Import revised translationsKenny Root2010-04-1423-871/+968
| | | | | | | | | | | | Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
* | | Merge "Update the tethering help with correct link." into froyoRobert Greenwalt2010-04-1466-5/+1853
|\ \ \
| * | | Update the tethering help with correct link.Robert Greenwalt2010-04-1466-5/+1853
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adding localized versions. bug:2561337 bug:2591665 Change-Id: Ic2543d0c524738f67c3bbf51e0c707117671b0e4
* | | | Merge "Grey out wifi tethering in airplane mode" into froyoIrfan Sheriff2010-04-141-2/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Grey out wifi tethering in airplane modeIrfan Sheriff2010-04-141-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When airplane mode is enabled, wifi tethering should be disabled since there is no real use case for it. This also addresses the issue of trying to restore Wifi (with tethering on) when airplane mode is disabled. Bug: 2594720 Change-Id: I7379ebed74a58b148ae82ed589d09aa2b9ca767d
* | | | Merge "Fix 2594148: confirm PIN/Password before resetting device" into froyoJim Miller2010-04-146-33/+36
|\ \ \ \
| * | | | Fix 2594148: confirm PIN/Password before resetting deviceJim Miller2010-04-146-33/+36
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where user was allowed to factory reset the device without entering their PIN/Password. It also fixes the same issue with MediaFormat (Settings->SD Card->Format). Change-Id: I0677a50aa771ad8663513fd7ec398a70953dcde2
* | | | Merge "Fix 258181 Enable moving apps to external storage if install location ↵Suchi Amalapurapu2010-04-141-9/+5
|\ \ \ \ | |/ / / |/| | | | | | | is set and they had been moved to internal storage." into froyo
| * | | Fix 258181Suchi Amalapurapu2010-04-131-9/+5
| | |/ | |/| | | | | | | | | | | | | | | | Enable moving apps to external storage if install location is set and they had been moved to internal storage. Change-Id: I54b24303872dc525a86294c3d2b8c0c76dd366c5
* | | Fix 2582241: Update selection based on user setting instead.Jim Miller2010-04-131-3/+10
|/ / | | | | | | | | | | | | | | | | | | | | When the user adds a DPM, Settings removes all display timeout options with t > maxTimeout. It was incorrectly setting the preference to maxTimeout. The corrected code picks the user's preference if less than maxTimeout or nothing otherwise. Change-Id: I5a47fdce89f4cf216fd76bb585c3c0120b39db92
* | Fix bug 2577511 NPE in TTS SettingsJean-Michel Trivi2010-04-131-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | A previous bug had caused incorrect settings to be saved, in particular the default language variant was not stored, unlike the default language and country. When settings were restored, this caused an invalid group of settings to be loaded, with a null language variant. The fix consists in: - discarding invalid default language settings - reevaluating which language should be selected in the list of available languages. Change-Id: If58882a9acc28f14a78f6142fefa17d04ca4ad5d
* | Merge "Fixing bug #2591288" into froyoCharles Chen2010-04-121-1/+17
|\ \
| * | Fixing bug #2591288Charles Chen2010-04-121-1/+17
| | | | | | | | | | | | | | | | | | | | | The language pref needs to be set after populating the entries based on the selected engine. Change-Id: I16db4428eee83052ff7c5115942eef4bf3d87454
* | | Fix 2579923: Update language to make consistent with related feature.Jim Miller2010-04-121-1/+1
|/ / | | | | | | Change-Id: I2f07b92d717e4661ec3a2c25775fa90ef62caed3
* | Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyoCharles Chen2010-04-121-2/+2
|\ \
| * | Fixing bug 2577511 - incorrectly trying to access a setting.Charles Chen2010-04-121-2/+2
| |/ | | | | | | Change-Id: I50f3b2f4878bea1392aa36d47015cd312a59e23a
* | Merge "Fix 2579923: Make changing lock screen method more discoverable." ↵Jim Miller2010-04-1213-182/+283
|\ \ | |/ |/| | | into froyo
| * Fix 2579923: Make changing lock screen method more discoverable.Jim Miller2010-04-1113-182/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the organization of lock screen security settings to make choosing an alternate unlock method more discoverable. Instead of having to disable the old lock method to use a new one, the user now just has one set/change option in lock settings, with a list of method-specific setting below it. In addition, we ask the user to confirm their old credentials before prompting them to choose a new one, which eliminates one source of confusion. Also, ChooseLockGeneric now shows a UI if quality isn't specified. Any unlock method less secure than minimum specified by DevicePolicyManager (if active) is greyed out. Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
* | Merge "scan only when wifi is enabled" into froyoIrfan Sheriff2010-04-101-1/+7
|\ \ | |/ |/|
| * scan only when wifi is enabledIrfan Sheriff2010-04-091-1/+7
| | | | | | | | | | Bug: 2570611 Change-Id: Ibb51dee8ec110179ec28f9469526a1fe61e74d00
* | Fixing bugs 2577511 and 2581920.Charles Chen2010-04-083-7/+38
|/ | | | | | | | | | Making sure that the language, country, and variant defaults are always set to something to ensure that there won't be an NPE. Dismissing the ListPreference dialogs before a rotation to avoid list data corruption caused by the list being displayed while its data is being re-initialized. Change-Id: Iecdb3b4d415542dc8a4db162c930e6a6570a55f2
* Merge "Fix 2579481: Fix change alphanumeric password security hole" into froyoJim Miller2010-04-081-0/+1
|\
| * Fix 2579481: Fix change alphanumeric password security holeJim Miller2010-04-081-0/+1
| | | | | | | | | | | | | | This fixes a bug where changing an alphanumeric password didn't ask for the old password first. Change-Id: I8ef4d2b4b87d02c6ddd23da3177e6802fc579c64
* | Merge "Fix for 2579445 - Using the correct strings for accessing Intent ↵Charles Chen2010-04-081-3/+2
|\ \ | | | | | | | | | extras now." into froyo
| * | Fix for 2579445 - Using the correct strings for accessing Intent extras now.Charles Chen2010-04-071-3/+2
| | | | | | | | | | | | Change-Id: I8a0b8f3add637ffffed4119b976c800ab3251b72
* | | Merge "Fix 2579461 Disable move when manifest option for install location is ↵Suchi Amalapurapu2010-04-072-14/+38
|\ \ \ | | | | | | | | | | | | unspecified and install location is auto/internal" into froyo
| * | | Fix 2579461Suchi Amalapurapu2010-04-072-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable move when manifest option for install location is unspecified and install location is auto/internal Change-Id: Ic7a493ecbbed6017326e2ec728e25c6ea9de8223
* | | | Merge "b/2174155 Remove debug logging in bluetooth" into froyoMichael Chan2010-04-071-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | b/2174155 Remove debug logging in bluetoothMichael Chan2010-04-071-1/+1
| | |/ | |/| | | | | | | Change-Id: Ia40af3bb362fe99fbfda1a23cdcb04fb96af7ca8
* | | Merge "Fix for bug #2577984 - Settings app was trying to access the TTS ↵Charles Chen2010-04-071-9/+16
|\ \ \ | |_|/ |/| | | | | before the TTS was ready." into froyo
| * | Fix for bug #2577984 - Settings app was trying to access the TTSCharles Chen2010-04-071-9/+16
| | | | | | | | | | | | | | | | | | before the TTS was ready. Change-Id: Ic8127f12a2608982fb35e126c7522cf6747b93ac