summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Collapse)AuthorAgeFilesLines
* Settings: Use new shared dream setting defaults.John Spurlock2012-10-192-6/+15
| | | | | Bug:7373284 Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
* Merge "More migration to Global settings." into jb-mr1-devJeff Sharkey2012-10-184-15/+15
|\
| * More migration to Global settings.Jeff Sharkey2012-10-184-15/+15
| | | | | | | | | | Bug: 7375796 Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
* | Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-devRomain Guy2012-10-181-0/+34
|\ \
| * | Control OpenGL traces from Developer Options in SettingsRomain Guy2012-10-181-0/+34
| | | | | | | | | | | | | | | | | | | | | This change adds a new entry to the developer options screen in settings that lets you choose what OpenGL traces you want. Change-Id: Ie789fa20dbbabee1e509b697106072464e9f9d2b
* | | Merge "bluetooth won't turn on after turn Airplane mode off on setting ↵Zhihai Xu2012-10-181-6/+25
|\ \ \ | |_|/ |/| | | | | screen on manta(tablet)" into jb-mr1-dev
| * | bluetooth won't turn on after turn Airplane mode off on setting screen on ↵Zhihai Xu2012-10-181-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manta(tablet) The root cause is normally when change the airplane mode, the bluetooth setting UI will not be foreground. No listener is setup for bluetooth setting UI when it is in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled won't be called. But for manta, airplane mode setting and bluetooth setting UI both will show on the foreground due to bigger screen size. When we turn ariplane mode on, bluetooth manager service will disable bluetooth without changing the persist bluetooth setting. But bluetooth setting UI will listen to the bluetooth state change intent, it will receive bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged, which cause checked status changed from true to false to trigger the listener (onCheckedChanged) being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true) to change bluetooth persist state to OFF. So when we turn back airplane more to OFF, due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON. Don't need to consider thread synchronization, because everything is running on the main thread. bug 7366814 Change-Id: I138d1904df6cb17c7828295caa51a7d80abf99f2
* | | Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-devDaniel Sandler2012-10-183-7/+33
|\ \ \
| * | | More descriptive summary for "Sleep Mode" pref.Daniel Sandler2012-10-183-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will either show "Off" or the name of the selected dream. Also, move "When to sleep" out onto the visible part of the action bar if there's room, making it much easier to discover. Bug: 7320701 Change-Id: I1d4e2c17b764b8ee054dbb17c23f559d735e3450
* | | | Revert "bluetooth won't turn on after turn Airplane mode off on setting ↵Irfan Sheriff2012-10-171-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen on manta(tablet)" This reverts commit 0b21b3d725935c03a4ca4ab8476da2b0675a53cd. Bug: 7366814 Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
* | | | Merge "bluetooth won't turn on after turn Airplane mode off on setting ↵Zhihai Xu2012-10-171-10/+32
|\ \ \ \ | |_|_|/ |/| | | | | | | screen on manta(tablet)" into jb-mr1-dev
| * | | bluetooth won't turn on after turn Airplane mode off on setting screen on ↵Zhihai Xu2012-10-171-10/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manta(tablet) The root cause is normally when change the airplane mode, the bluetooth setting UI will not be foreground. No listener is setup for bluetooth setting UI when it is in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled won't be called. But for manta, airplane mode setting and bluetooth setting UI both will show on the foreground due to bigger screen size. When we turn ariplane mode on, bluetooth manager service will disable bluetooth without changing the persist bluetooth setting. But bluetooth setting UI will listen to the bluetooth state change intent, it will receive bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged, which cause checked status changed from true to false to trigger the listener (onCheckedChanged) being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true) to change bluetooth persist state to OFF. So when we turn back airplane more to OFF, due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON. bug 7366814 Change-Id: I07d4a2dfe03fc6775cfeabb28cd3a0cc1fded44e
* | | Fix check for multiple usersAmith Yamasani2012-10-171-1/+1
|/ / | | | | | | | | | | | | | | Bug: 7365839 Remove the Uninstall for all users option if less than 2 users on the device. Change-Id: I5d2d853e05e1d505b67f8b83b1d5ea7f9c6e7215
* | New developer setting: force 4x MSAARomain Guy2012-10-151-0/+16
| | | | | | | | Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
* | Merge "Fix issue #7330867: Cannot disable a built-in app if you've ↵Dianne Hackborn2012-10-141-30/+94
|\ \ | | | | | | | | | downloaded updates" into jb-mr1-dev
| * | Fix issue #7330867: Cannot disable a built-in app if you've downloaded updatesDianne Hackborn2012-10-121-30/+94
| | | | | | | | | | | | Change-Id: Ie9dfe4a9195e4583bead8066807e4bba8274801f
* | | Show the overflow in the right place for keyguard settingsAdam Powell2012-10-131-1/+3
| | | | | | | | | | | | Change-Id: Ie8b2c8acf97736041bf09a64c0f1d77f80350f4c
* | | Merge "Disable security widgets for now" into jb-mr1-devJim Miller2012-10-121-9/+22
|\ \ \ | |/ / |/| |
| * | Disable security widgets for nowMichael Jurka2012-10-111-9/+22
| | | | | | | | | Change-Id: Ia4627d697514c4029fb0fb3250d674ed25495f97
* | | Merge "Fix a regression in exiting the activity on picking a locale" into ↵Amith Yamasani2012-10-111-0/+1
|\ \ \ | |_|/ |/| | | | | jb-mr1-dev
| * | Fix a regression in exiting the activity on picking a localeAmith Yamasani2012-10-101-0/+1
| | | | | | | | | | | | | | | Bug: 7326748 Change-Id: I5db57c805c104bf01c256f65990aec6deae27789
* | | Merge "Launch account addition activity from Settings instead of from ↵Amith Yamasani2012-10-111-7/+30
|\ \ \ | | | | | | | | | | | | AccountManager" into jb-mr1-dev
| * | | Launch account addition activity from Settings instead of from AccountManagerAmith Yamasani2012-10-101-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables us to watch for failure cases from certain authenticators that misbehave. Bug: 7318390 Change-Id: I43398e7622214cabd1d1bf171502c6a988af00a3
* | | | Merge "Fix issue #7328934: change threshold of developer options countdown ↵Dianne Hackborn2012-10-112-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | toast" into jb-mr1-dev
| * | | | Fix issue #7328934: change threshold of developer options countdown toastDianne Hackborn2012-10-112-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay showing toasts until the third tap. Also harden the dev settings code that pokes system property changes to not crash if a system service throws an exception back. Change-Id: I1351e2c950f2bcc4fc72afb60995fd7f84319e3d
* | | | | Fix crash in Settings for secondary usersAmith Yamasani2012-10-101-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 7328485 Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
* | | | Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-devJeff Sharkey2012-10-101-19/+11
|\ \ \ \
| * | | | Switch to IPackageManager.getServiceInfo().Jeff Sharkey2012-10-101-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7095093 Change-Id: I79b9f077c9d69c5629b7dd0071a11ccda50839cd
* | | | | Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-devJeff Sharkey2012-10-102-18/+0
|\ \ \ \ \ | |/ / / /
| * | | | Move lockscreen to using haptic feedback setting.Jeff Sharkey2012-10-102-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes lockscreen-specific "Vibrate on touch" setting, and changes it to use the haptic feedback setting instead. Bug: 7318772 Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
* | | | | Merge "Fix issue #7318666: hide developer options from user build" into ↵Dianne Hackborn2012-10-103-10/+90
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | jb-mr1-dev
| * | | | Fix issue #7318666: hide developer options from user buildDianne Hackborn2012-10-103-10/+90
| |/ / / | | | | | | | | | | | | Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
* | | | Merge "Use user-specific PackageManager." into jb-mr1-devJeff Sharkey2012-10-101-9/+18
|\ \ \ \
| * | | | Use user-specific PackageManager.Jeff Sharkey2012-10-101-9/+18
| |/ / / | | | | | | | | | | | | | | | | Bug: 7095093 Change-Id: Ia97065d4bdf5203372b76b62a6dfd72858892234
* | | | Accessibility enabled by gesture not reflected in settings screen.Svetoslav Ganov2012-10-101-13/+47
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We have added a global gesture to enable accessibility which is long press on power followed by a long press with two fingers. If this gesture is performed when the settings for an accessibility service are on the screen, accessibility and the screen-reader are enabled while the UI does not reflect that and the user may try to enable the already enabled screen-reader which will show two irrelevant warning dialogs - one for enabling the screen-reader and one for enabling explore by touch (assuming the screen-reader requests it). This change adds a simple content observer for the relevant accessibility settings which upon a change calls the functions to refresh the settings UI. bug:7309127 Change-Id: I214c64877086eeb1fe156bcc195aa4e2931d6bdb
* | | Merge "Return RESULT_OK when wifi connection established" into jb-mr1-devRussell Brenner2012-10-101-0/+2
|\ \ \
| * | | Return RESULT_OK when wifi connection establishedRussell Brenner2012-10-091-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Two new exit points were not setting a return result. Since the default result for an activity is RESULT_CANCEL, Setup Wizard was continuing as if no connection was made. Bug: 7298234 Change-Id: I44085f38ed021b7d417f9794b3341747f00300e9
* | | Merge "Go back to top of list when Settings is relaunched" into jb-mr1-devAmith Yamasani2012-10-101-4/+8
|\ \ \
| * | | Go back to top of list when Settings is relaunchedAmith Yamasani2012-10-091-4/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | Also fixes slight movements when coming back from Add account. Bug: 7312513 Bug: 7318452 Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
* | | Merge "Have poor network avoidance turned off by default" into jb-mr1-devIrfan Sheriff2012-10-091-1/+4
|\ \ \ | |/ / |/| |
| * | Have poor network avoidance turned off by defaultIrfan Sheriff2012-10-091-1/+4
| | | | | | | | | | | | | | | Bug: 7318044 Change-Id: I1c86ffd2dae168a3eb35f08cd09096a7f28de2a9
* | | Merge "Accessibility settings should update after gesture to enable ↵Svetoslav Ganov2012-10-081-0/+30
|\ \ \ | | | | | | | | | | | | accessibility." into jb-mr1-dev
| * | | Accessibility settings should update after gesture to enable accessibility.Svetoslav Ganov2012-10-081-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We have added a global gesture to enable accessibility which is long press on power follower by a long press with two fingers. If this gesture is performed when accessibility settings are on the screen, accessibility and the screen-reader are enabled while the UI does not reflect that and the user may try to enable the already enabled screen-reader which will show two irrelevant warning dialogs - one for enabling the screen-reader and one for enabling explore by touch (assuming the screen-reader requests it). This change adds a simple content observer for the relevant accessibility settings which upon a change calls the functions to refresh the settings UI. bug:7309127 Change-Id: I45851d7789e24e9e0a5bc5aaac39db9a12b60e0c
* | | | Remove further loggingVikram Aggarwal2012-10-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7302014 CryptKeeper logs PII data Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
* | | | Merge "Allow disconnected BT profiles to be unchecked in Settings." into ↵Jake Hamby2012-10-082-9/+12
|\ \ \ \ | |/ / / |/| | | | | | | jb-mr1-dev
| * | | Allow disconnected BT profiles to be unchecked in Settings.Jake Hamby2012-10-042-9/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Bluetooth profile list, the checkbox indicates whether the profile is preferred (we should auto connect). If the profile is not connected, selecting it will try to connect the profile and set it to preferred. If the profile can't be connected, then the user could not turn off the preferred setting for the profile. Change the behavior so that when a profile is not connected, but is marked as preferred, selecting the profile will turn off the preferred setting (no auto connect) instead of trying to connect. This enables the user to turn off auto connect for a profile when it can't be connected. Tapping a second time will try to connect the profile and set it as preferred, as usual. Also change PanProfile to return the current connection status for isPreferred() instead of always returning true. Currently, the PAN profile is always checked, which is confusing because it looks like PAN is always connected. Also, because of the new behavior when a profile is selected, it's now necessary to return false for isPreferred() when PAN isn't connected, so that we will try to connect when the user selects it, instead of trying to turn off the preferred setting, which isn't supported for PAN. Bug: 7007641 Change-Id: Ifb0f51a15379bc254933168c43bdfc8b22f26051
* | | Remove verbose loggingVikram Aggarwal2012-10-081-2/+0
| |/ |/| | | | | | | | | Bug: 7302014 CryptKeeper logs PII data Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
* | Merge "Revert "Show warning dialog in a multiuser system when adding a new ↵Amith Yamasani2012-10-051-65/+5
|\ \ | | | | | | | | | account."" into jb-mr1-dev
| * | Revert "Show warning dialog in a multiuser system when adding a new account."Amith Yamasani2012-10-051-65/+5
| | | | | | | | | | | | | | | | | | This reverts commit eb71f2689785bd43560afb04f8b2281c3f67f695 Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5
* | | Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-devAdam Cohen2012-10-051-1/+1
|\ \ \