summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge "Fix accessibility gesture summary text." into jb-mr1-devCharles Chen2012-10-111-1/+1
|\ \ \
| * | | Fix accessibility gesture summary text.alanv2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 7309663 Change-Id: I669e26d0ffafe73f0fc9296c4ba91c7c08a89ae0
* | | | Merge "Fix crash in Settings for secondary users" into jb-mr1-devAmith Yamasani2012-10-101-1/+2
|\ \ \ \
| * | | | Fix crash in Settings for secondary usersAmith Yamasani2012-10-101-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 7328485 Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
* | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1030-87/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-1030-87/+55
| | |/ | |/| | | | | | | | | | Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61 Auto-generated-cl: translation import
* | | 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-105-30/+0
|\ \ \ \ | |/ / /
| * | | Move lockscreen to using haptic feedback setting.Jeff Sharkey2012-10-105-30/+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-104-11/+97
|\ \ \ \ | |/ / / |/| | | | | | | jb-mr1-dev
| * | | Fix issue #7318666: hide developer options from user buildDianne Hackborn2012-10-104-11/+97
| |/ / | | | | | | | | | 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
* | | Merge "Accessibility enabled by gesture not reflected in settings screen." ↵Svetoslav Ganov2012-10-101-13/+47
|\ \ \ | | | | | | | | | | | | into jb-mr1-dev
| * | | 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 "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-devAdam Powell2012-10-103-1/+25
|\ \ \ | |/ / |/| |
| * | Fix padding for PagerTabStrip on large screen devicesAdam Powell2012-10-103-1/+25
| | | | | | | | | | | | | | | | | | Bug 7323241 Change-Id: I83cd4d4e1eea150817c519328bb2572b6043b3b7
* | | 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 "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-0849-333/+238
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-0849-333/+238
| | | | | | | | | | | | | | | | | | | | Change-Id: Id0bdf68adcdbafb85d848aacc2ceccc5f619fba3 Auto-generated-cl: translation import
* | | | 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 "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-0825-93/+49
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-0525-93/+49
| | | | | | | | | | | | | | | Change-Id: I370e6491b374c4c828b128955eefce762335fa52 Auto-generated-cl: translation import
* | | Merge "Fix layout for decryption password entry." into jb-mr1-devAmith Yamasani2012-10-072-82/+7
|\ \ \
| * | | Fix layout for decryption password entry.Amith Yamasani2012-10-072-82/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same layout for landscape and portrait, which vertically centers the password entry field. Works fine for portrait. Also removed some vestigial keyboard view in the layout. Bug: 7298970 Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830
* | | | Clean up 'accessibility shortcut' screen.Svetoslav Ganov2012-10-071-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | 1. Last polishes to the accessibility shortcut screen. bug:7298927 Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
* | | Merge "Revert "Show warning dialog in a multiuser system when adding a new ↵Amith Yamasani2012-10-053-70/+7
|\ \ \ | | | | | | | | | | | | account."" into jb-mr1-dev
| * | | Revert "Show warning dialog in a multiuser system when adding a new account."Amith Yamasani2012-10-053-70/+7
| |/ / | | | | | | | | | | | | | | | This reverts commit eb71f2689785bd43560afb04f8b2281c3f67f695 Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5
* | | Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-devAdam Cohen2012-10-051-1/+1
|\ \ \
| * | | Fixing filter for status widget (issue 7295596)Adam Cohen2012-10-051-1/+1
| | | | | | | | | | | | | | | | Change-Id: I63515bc68550357b8e2738450eefa01ec3122229
* | | | Updating the screen magnification strings.Svetoslav Ganov2012-10-053-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | bug:7295457 Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
* | | | Merge "Avoid NPE when missing PackageInfo." into jb-mr1-devJeff Sharkey2012-10-051-1/+1
|\ \ \ \
| * | | | Avoid NPE when missing PackageInfo.Jeff Sharkey2012-10-051-1/+1
| | |/ / | |/| | | | | | | | | | | | | | Bug: 7296861 Change-Id: I87b64d5f4b1f34e47d785a18a029130fdca874a1
* | | | Locale selection settings do not hide warning dialog.Svetoslav Ganov2012-10-051-2/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. If there is more than one user on the device and a user tries to modify the locale which is shared across all users we are showing a warning dialog. When the user selects OK we are changing the locale and going to the previous screen. This is achieved by removing the locale selection fragment from the backstack. The problem was that the dialog was not dismissed upon OK in the dialog which resulted in saving the dialog's state and an attempt to restore it on the wrong fragment which has no idea about this dialog, this returning a null dialog resulting in a crash. This change removes the dialog on OK selection. bug:7265186 Change-Id: I336ab54f5281c7a9ae24f1c25769daac46477ebd
* | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-0430-568/+294
|\ \ \