summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Alert for using network-only-tts with no network.Przemyslaw Szczepaniak2012-10-291-1/+54
| | | | | | | | | If TTS requires network for selected language, we will show dialog informing why we can't synthesize an example if user have no internet connectivity. Bug: 7398316 Change-Id: I01b033a9a8b8538b322ed3639b671f90f849ae29
* am f1e74da7: am cde507af: am b02771ef: Merge "Reduce jank in security lock ↵Amith Yamasani2012-10-241-4/+20
|\ | | | | | | | | | | | | selection by finishing on return" into jb-mr1-dev * commit 'f1e74da7b6b6267d5ce1da432760552cc7ad8673': Reduce jank in security lock selection by finishing on return
| * Merge "Reduce jank in security lock selection by finishing on return" into ↵Amith Yamasani2012-10-241-4/+20
| |\ | | | | | | | | | jb-mr1-dev
| | * Reduce jank in security lock selection by finishing on returnAmith Yamasani2012-10-241-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier the finish of the chooser was happening before the pattern/pin chooser was started, resulting in two transitions. This change defers the finish to after returning from the other activity. There is still sometimes a very small glitch on the way back, but much smaller than the current problem. Bug: 7342594 Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd
* | | am d525470d: am 039a365f: am 5749ce09: Merge "Use given name instead of full ↵Amith Yamasani2012-10-243-12/+73
|\ \ \ | |/ / | | | | | | | | | | | | | | | name for the initial population of User name." into jb-mr1-dev * commit 'd525470d4b7a290b7a55ee244d47f8e486cfe72c': Use given name instead of full name for the initial population of User name.
| * | Merge "Use given name instead of full name for the initial population of ↵Amith Yamasani2012-10-243-12/+73
| |\ \ | | |/ | |/| | | | User name." into jb-mr1-dev
| | * Use given name instead of full name for the initial population of User name.Amith Yamasani2012-10-243-12/+73
| | | | | | | | | | | | | | | | | | Bug: 7406217 Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e
* | | am efc9458b: am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device ↵Amith Yamasani2012-10-221-7/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | admin enforces a small timeout for screen lock" into jb-mr1-dev * commit 'efc9458b46cdbab7abe5df169d83a09582e8e6cd': Fixes an AIOOBE when device admin enforces a small timeout for screen lock
| * | Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen ↵Amith Yamasani2012-10-221-7/+11
| |\ \ | | | | | | | | | | | | lock" into jb-mr1-dev
| | * | Fixes an AIOOBE when device admin enforces a small timeout for screen lockAmith Yamasani2012-10-221-7/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | Bug: 7378871 If the timeout choices are empty, set an empty summary. Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
* | | am 8f2a9c00: am 6a07244f: am a023f4f6: Merge "Prevent sync state changes ↵Guang Zhu2012-10-223-3/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | when user is a monkey" into jb-mr1-dev * commit '8f2a9c0043081f0008bfadc50bb7cbc010a2b3cb': Prevent sync state changes when user is a monkey
| * | Merge "Prevent sync state changes when user is a monkey" into jb-mr1-devGuang Zhu2012-10-223-3/+18
| |\ \ | | |/ | |/|
| | * Prevent sync state changes when user is a monkeyGuang Zhu2012-10-223-3/+18
| | | | | | | | | | | | | | | | | | Bug: 7385019 Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
* | | am 86a52bec: am 5c412204: am 56a166e9: Added info about why Wi-Fi is requiredRussell Brenner2012-10-211-1/+9
|\ \ \ | |/ / | | | | | | | | | * commit '86a52bec4b0134e540cc5c546da4e88dc2d62487': Added info about why Wi-Fi is required
| * | Added info about why Wi-Fi is requiredRussell Brenner2012-10-191-1/+9
| |/ | | | | | | | | | | | | | | Added a new optional textview to wifi settings, informing that wifi is required during setup. For use on Nakasi 3G. Bug: 7383934 Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
* | am 9055dd74: am 76f99688: am d983e1d1: Settings: Use new shared dream ↵John Spurlock2012-10-192-6/+15
|\ \ | |/ | | | | | | | | | | setting defaults. * commit '9055dd74f4ac42e422de941259d9f9c437ef9eca': Settings: Use new shared dream setting defaults.
| * Settings: Use new shared dream setting defaults.John Spurlock2012-10-192-6/+15
| | | | | | | | | | Bug:7373284 Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
* | am 049ccb55: am 0d4fd237: am 5a740ab1: Merge "More migration to Global ↵Jeff Sharkey2012-10-184-15/+15
|\ \ | |/ | | | | | | | | | | settings." into jb-mr1-dev * commit '049ccb55361de3ef41b01875569b341c4f06d1db': More migration to Global settings.
| * 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
* | | am b8b34ba9: am 6dc2c7a5: am 8b982465: Merge "Control OpenGL traces from ↵Romain Guy2012-10-181-0/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | Developer Options in Settings" into jb-mr1-dev * commit 'b8b34ba9f5e1fb545276dc95ff57859e26188265': Control OpenGL traces from Developer Options in Settings
| * | 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
* | | | am ecb7f618: am 3e1e454b: am 8346107d: Merge "bluetooth won\'t turn on after ↵Zhihai Xu2012-10-181-6/+25
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev * commit 'ecb7f618576300e5d729c1aab2938169634f0d33': bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
| * | | 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
* | | | am 6749fb88: am 260e34b2: am deb5a843: Merge "More descriptive summary for ↵Daniel Sandler2012-10-183-7/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "Sleep Mode" pref." into jb-mr1-dev * commit '6749fb88efaacf1e1de23fd170d0797562101aee': More descriptive summary for "Sleep Mode" pref.
| * | | 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
* | | | | am 5a8b0b82: am c58479ec: am 50023033: Merge "Revert "bluetooth won\'t turn ↵John Huang2012-10-171-32/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev * commit '5a8b0b8276701ee230ad6f02c8474dd05a67c595': Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
| * | | | 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
* | | | | am 933bef3d: am 8d08bc53: am 6ec44ff0: Merge "bluetooth won\'t turn on after ↵Zhihai Xu2012-10-171-10/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev * commit '933bef3db03d25ba430139ef9bdb12369a70661b': bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
| * | | | 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
* | | | am fca149f2: am c45f88ea: am 7a1c4cdf: Fix check for multiple usersAmith Yamasani2012-10-171-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fca149f25859a902506cd449ed73fe54c0fad740': Fix check for multiple users
| * | | 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
* | | am fd0a3d08: am a1090b41: am 891185a4: Merge "New developer setting: force ↵Romain Guy2012-10-161-0/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | 4x MSAA" into jb-mr1-dev * commit 'fd0a3d08238c6c924e702266da58e3d8f512a94c': New developer setting: force 4x MSAA
| * | New developer setting: force 4x MSAARomain Guy2012-10-151-0/+16
| | | | | | | | | | | | Change-Id: I443b97ad8adc9f461aa140069f208f83f19f8c52
* | | am 31d866e1: am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot ↵Dianne Hackborn2012-10-141-30/+94
|\ \ \ | |/ / | | | | | | | | | | | | | | | disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev * commit '31d866e1c612d2391e8b279addd052ac779c503b': Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
| * | 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
* | | | am fcf460eb: am cc7f6e92: am a5f6762a: Show the overflow in the right place ↵Adam Powell2012-10-131-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for keyguard settings * commit 'fcf460eb874953fd663711fe7d6164f700d181ae': Show the overflow in the right place for keyguard settings
| * | | Show the overflow in the right place for keyguard settingsAdam Powell2012-10-131-1/+3
| | | | | | | | | | | | | | | | Change-Id: Ie8b2c8acf97736041bf09a64c0f1d77f80350f4c
* | | | am 0b0f1ea2: am 17963414: am afc0036e: Merge "Disable security widgets for ↵Jim Miller2012-10-121-9/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | now" into jb-mr1-dev * commit '0b0f1ea2c25e7c68e60ab64e2adeb2cca24173a7': Disable security widgets for now
| * | | 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
* | | | am a6b3ecbe: am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting ↵Amith Yamasani2012-10-121-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | the activity on picking a locale" into jb-mr1-dev * commit 'a6b3ecbebfa2d5de7525184747116edaea1c148f': Fix a regression in exiting the activity on picking a locale
| * | | 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
* | | | am 33e8e04d: am 552bebe0: am 35bbbc6c: Merge "Launch account addition ↵Amith Yamasani2012-10-111-7/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | activity from Settings instead of from AccountManager" into jb-mr1-dev * commit '33e8e04d844713f59ca0193bb93f8ae9bedbe72c': Launch account addition activity from Settings instead of from AccountManager