summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Collapse)AuthorAgeFilesLines
* Improve encapsulationJean Chalard2012-05-092-3/+6
| | | | Change-Id: I30d28c3a62cc5de3432f04b6469eca077ee3eff6
* Remove the useless parts in the 'add word' dialog.Jean Chalard2012-05-091-50/+0
| | | | | Bug: 6026080 Change-Id: Ic2bf6dcfc2abfe5fc07759530042299cc6a0b503
* Move the spinner code to the fragment.Jean Chalard2012-05-092-33/+36
| | | | | Bug: 6026080 Change-Id: I49e1aa1839266ca169982b6a4800ee9923451be5
* Cut a helper method to increase encapsulation.Jean Chalard2012-05-094-60/+69
| | | | Change-Id: Ie47503a99d455f7266e281914e92ed680b993551
* Merge "Settings to control traces." into jb-devDianne Hackborn2012-05-081-16/+102
|\
| * Settings to control traces.Dianne Hackborn2012-05-081-16/+102
| | | | | | | | | | | | | | | | | | Also some re-organization of the debug options, and check for the case where the global debug setting is turned off but there are some debug options turned on (in which case we just switch to the global option being on). Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8
* | Merge "Occlude syncs without provider info." into jb-devCarlos Valdivia2012-05-081-3/+5
|\ \
| * | Occlude syncs without provider info.Carlos Valdivia2012-05-081-3/+5
| | | | | | | | | | | | | | | Bug: 934147 Change-Id: Ib3413efda07432cfc52cb5b1a20350ed5c7655a8
* | | Merge "Allow movement of forward-locked apps to SD" into jb-devKenny Root2012-05-081-2/+1
|\ \ \
| * | | Allow movement of forward-locked apps to SDKenny Root2012-05-081-2/+1
| |/ / | | | | | | | | | | | | | | | | | | Forward-locked apps are now in ASEC containers which can exist on both SD card and internal storage. Merry Christmas. Change-Id: If793cf76858395bfc67cd18ab18f488a83757d5f
* | | Merge "Revert "Make verifier device id information visible"" into jb-devKenny Root2012-05-081-10/+0
|\ \ \
| * | | Revert "Make verifier device id information visible"Kenny Root2012-05-081-10/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 498fbe470e8201ed6d4a1677025b274d9ca65e0b. Conflicts: res/xml/development_prefs.xml src/com/android/settings/DevelopmentSettings.java Bug: 6438155 Change-Id: I3ab866d0a269e355388bb3ef41737a7d097df8f6
* | | Merge "Appease the monkey gods." into jb-devAmith Yamasani2012-05-081-2/+2
|\ \ \ | |/ / |/| |
| * | Appease the monkey gods.Amith Yamasani2012-05-071-2/+2
| | | | | | | | | | | | | | | | | | Bug: 6443925 Change-Id: Ia36a154d63763d7a3f826a80a5d1ae678b94208e
* | | Merge "Changes for new vibration policy." into jb-devEric Laurent2012-05-081-1/+1
|\ \ \
| * | | Changes for new vibration policy.Eric Laurent2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Select silent icon based on mAudioManager.getRingerMode() since AudioManager.shouldVibrate() is deprecated. Change-Id: Iaa474dbb8c1b5fb8fc3b6eeb3426fde3e7b879c3
* | | | Merge "Hide Back button when requesting intent says to" into jb-devAndrew Flynn2012-05-081-1/+6
|\ \ \ \
| * | | | Hide Back button when requesting intent says toAndrew Flynn2012-05-081-1/+6
| | |_|/ | |/| | | | | | | | | | Change-Id: I79ed35843500f20367568510ea8df3afe543ede8
* | | | Merge "Avoid split action bar on phones." into jb-devAmith Yamasani2012-05-081-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid split action bar on phones.Jeff Sharkey2012-05-081-1/+4
| | | | | | | | | | | | | | | | Change-Id: I6cf8400a09562eb905568cd6681773e94df556d8
* | | | Move the word commit code to UserDictionaryAddWordContent.Jean Chalard2012-05-083-32/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and call it from the fragment too. Bug: 6026080 Change-Id: Icb83fd60ed33dfa593124ed0af6b9fff4b63f1f5
* | | | Factor some codeJean Chalard2012-05-084-50/+98
| | | | | | | | | | | | | | | | | | | | Bug: 6026080 Change-Id: I38475a95b1d421162099390244dbda09658346f5
* | | | Implement the "add word" screen according to new specJean Chalard2012-05-083-5/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only the interface. It doesn't do anything yet, so as to avoid a too large change. Bug: 6026080 Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
* | | | Fix a janky transitionJean Chalard2012-05-082-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 6026080 Change-Id: I75bd244b2b09c371805a67057d2a9c45dc12f3db
* | | | Merge "Reduce the amount of I/O done on the UI thread." into jb-devAmith Yamasani2012-05-071-7/+18
|\ \ \ \
| * | | | Reduce the amount of I/O done on the UI thread.Amith Yamasani2012-05-071-7/+18
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was unnecessary saving of IME settings when changing the state of the checkboxes, causing ANRs when monkeys are switching between Settings fragments quickly while other background activity is using I/O as well. In fact, all I/O should be removed, but this change at least reduces some of it. Potential fix for: Bug: 6414289 Change-Id: Ice96f0f9d921128b27ddbe26519a6791d9f01c75
* | | | Merge "Remove poor connection UI with watchdog disabled" into jb-devIrfan Sheriff2012-05-071-3/+9
|\ \ \ \
| * | | | Remove poor connection UI with watchdog disabledIrfan Sheriff2012-05-071-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6449324 Change-Id: I8ddd486ce433b30dd76d385680fdb79d2b90e8eb
* | | | | Merge "Remove NSD checkbox" into jb-devIrfan Sheriff2012-05-071-3/+10
|\ \ \ \ \
| * | | | | Remove NSD checkboxIrfan Sheriff2012-05-071-3/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 6449478 Change-Id: Ic4aa44cb08843819c3290b16d906c989ee306727
* | | | | Merge "Removed the no longer needed font size span flag fix" into jb-devGilles Debunne2012-05-071-10/+0
|\ \ \ \ \
| * | | | | Removed the no longer needed font size span flag fixGilles Debunne2012-05-041-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to bug 6448052 A text replacement (as opposed to a deletion) should (and will) not removei the EXCLUSIVE_EXCLUSIVE spans that have limits identical to the replaced range of charcters. Change-Id: Iefaeab9e5119e7223ef6800c55ff0c741976e138
* | | | | | Add WPS Push Button back into Setup Wizard Wi-FiRussell Brenner2012-05-061-2/+9
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't yet the image button shown in the UX flows, but pending artwork and some potential tricky Preference layout changes, this will give access to the WPS functionality. Bug: 6449333 Change-Id: Ibda0e48cf972dad10c7e92a7482fca9b3c104559
* | | | | Write the airplane setting in addition to sending the Intent.Vikram Aggarwal2012-05-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dab was right. :) Fix b/6006192 in association with https://android-git.corp.google.com/g/187160 Change-Id: I3edfb3191ab35a4e5de1b18f3e2e1dae5f882354
* | | | | Merge "Go into airplane mode in minimal boot mode." into jb-devVikram Aggarwal2012-05-041-0/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Go into airplane mode in minimal boot mode.Vikram Aggarwal2012-05-041-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix b/6006192 Change-Id: Ied4d9b51aac4e8ac1d2114aa1e95d4ebbe93413b
* | | | | Merge "Avoid animation flashing and fix padding." into jb-devJeff Sharkey2012-05-041-21/+18
|\ \ \ \ \
| * | | | | Avoid animation flashing and fix padding.Jeff Sharkey2012-05-041-21/+18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 6446203 Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
* | | | | Merge "Better messaging when Wi-Fi disabled." into jb-devJeff Sharkey2012-05-041-4/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Better messaging when Wi-Fi disabled.Jeff Sharkey2012-05-041-4/+5
| |/ / / | | | | | | | | | | | | | | | | Bug: 6443166 Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
* | | | Merge "Always on the valid system default ime" into jb-devsatok2012-05-032-9/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Always on the valid system default imesatok2012-05-022-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6422390 Change-Id: I9af4065e4b9f9332f3b0db168dea5546727d5951
* | | | Merge "Fall back to Wi-Fi data when SIM missing." into jb-devJeff Sharkey2012-05-031-2/+6
|\ \ \ \
| * | | | Fall back to Wi-Fi data when SIM missing.Jeff Sharkey2012-05-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6427657 Change-Id: I0613b4b89ddbea1cde2fd96ce6dd4bacb0fb4eaa
* | | | | UI fixes for tabletsVikram Aggarwal2012-05-031-0/+10
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Center the clock on Xoom and large tablets. Fix b/5579000 2. Correctly remove the emergency call button if the device (*cough* Nakasi *cough*) does not have telephone capability. Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
* | | | Notification alert every 5s and start after 30s.Vikram Aggarwal2012-05-021-6/+5
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Justification: Most users will not need prompting, so for them a notification will be an annoyance. So we only notify if the no password has been entered for 30 seconds. Once a notification sound is made, we need to make it frequently so the user can locate the device. Change-Id: Ibf531aec89b5e3b3c72eaa36016bcc4cac1d6493
* | | Merge "Fix NPE in ManageApps when switching orientation." into jb-devAmith Yamasani2012-05-011-1/+6
|\ \ \
| * | | Fix NPE in ManageApps when switching orientation.Amith Yamasani2012-05-011-1/+6
| | | | | | | | | | | | | | | | | | | | Bug: 6394351 Change-Id: Ia66ab18195325b024223cdbce19756150e1d6c8c
* | | | Notify user when waiting for decryption passwordVikram Aggarwal2012-05-011-27/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Disable back presses from physical keyboard during encryption: Fix b/6139810 2. Keep screen on when waiting for password. Fix b/6153213 and b/6149606 3. Alert the user with sound when waiting for password. Fix b/6149606 4. Add debugging feature to display the password screen without having to reboot the device. Change-Id: I588aa7d96e1140f95a6fa91e0281117907f666f7
* | | | Do not reuse master_clear_gesture_* strings for credential installation ↵Brian Carlstrom2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmation Bug: http://code.google.com/p/android/issues/detail?id=29367 Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6