summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Fix crash when viewing installed app details pageMichael Jurka2012-10-171-0/+2
| | | | Change-Id: I6b4f644d5208c8ac0254bcc8348b87575c431c06
* Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1649-264/+528
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-1649-264/+528
| | | | | | | | | | Change-Id: Ica70679f4072603b62a08f46d26f1625a5820788 Auto-generated-cl: translation import
* | Remove clockVikram Aggarwal2012-10-161-38/+0
|/ | | | | | Bug: 7267695 time on "decrypt storage" page is wrong Change-Id: I582e758006f0e01aedaffc6c9310d550abb56000
* Merge "New developer setting: force 4x MSAA" into jb-mr1-devRomain Guy2012-10-163-0/+26
|\
| * New developer setting: force 4x MSAARomain Guy2012-10-153-0/+26
| | | | | | | | Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
* | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1616-130/+66
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-1216-130/+66
| | | | | | | | | | | | | | | Change-Id: Ibccc9691d27fec1b597ca3e8fae1d82f6a8943d7 Auto-generated-cl: translation import
* | | Align text in Language & input screenAmith Yamasani2012-10-151-5/+4
| |/ |/| | | | | | | Bug: 7336478 Change-Id: I38e916e851cbae3284970fe8d8764a6a6018b0ff
* | Merge "Let's enhance" into jb-mr1-devJason Chen2012-10-144-0/+0
|\ \
| * | Let's enhanceJason Chen2012-10-124-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Add mipmap-xxhdpi launcher icon asset. Remove unneeded drawable-based launcher icon assets while we're at it. Bug: 6718166 Change-Id: I0f9ed4968569e0c2bce44e617a0586f0672d916a
* | | Merge "Fix issue #7330867: Cannot disable a built-in app if you've ↵Dianne Hackborn2012-10-143-30/+104
|\ \ \ | | | | | | | | | | | | downloaded updates" into jb-mr1-dev
| * | | Fix issue #7330867: Cannot disable a built-in app if you've downloaded updatesDianne Hackborn2012-10-123-30/+104
| | |/ | |/| | | | | | | 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 "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-1249-56/+398
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-1149-56/+398
| | | | | | | | | | | | | | | Change-Id: Iab3d6f1b9911ed3b1ef2472e083a3f55faa4a474 Auto-generated-cl: translation import
* | | 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
* | | | | 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
|\ \ \ \