summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix issue #4999758: Disabling a system app should require...Dianne Hackborn2011-07-181-3/+24
| |/ / | | | | | | | | | | | | | | | ...a scary sounding confirmation Change-Id: I88b14a95b804f14d25a9efcb04b282d60f9719c3
* | | Merge "Removed summary text and categories in Wireless settings"Gilles Debunne2011-07-183-22/+2
|\ \ \ | |/ / |/| |
| * | Removed summary text and categories in Wireless settingsGilles Debunne2011-07-083-22/+2
| | | | | | | | | | | | | | | | | | Bug 5002377 and 5002476. Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
* | | Merge "USB: Toggle installer CD menu title when installer CD is ↵Mike Lockwood2011-07-181-13/+40
|\ \ \ | | |/ | |/| | | | enabled/disabled"
| * | USB: Toggle installer CD menu title when installer CD is enabled/disabledMike Lockwood2011-07-181-13/+40
| | | | | | | | | | | | | | | | | | | | | Bug: 5032789 Change-Id: I0710133b2318147c7556e9f970f4443511ee1729 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Bluetooth : Fix for changing the BT device icon if the calss is null (mouse)jhtop.kim2011-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | - mouse is displayed as keyboard. if class is null, default icon is keyboard in hid profile Change-Id: I2ff928ce1032d8eb492d81fff2e7fb218970b768 Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
* | | Bluetooth : fix to finish deviceprofilesettings activity when device is not ↵jhtop.kim2011-07-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | bonded - if cached device state is "BluetoothDevice.BOND_NONE" then finish activity Change-Id: I5c981e8c4800c10f1f8570668794301d5da03188 Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
* | | Bluetooth : fix UI bug: Disable "OK" button if friendly name is nulljhtop.kim2011-07-181-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | - If device's name is null, BT address is set as friendly name. - so, fixed. if name field is null "OK" button is disabled. Change-Id: I04b59ebf13d1b3203acf7345bd531cc6c563da0d Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
* | | Bluetooth : UI bug fix : Pairing dialog box takes space as characterjhtop.kim2011-07-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | - In pairing dialog box even if PIN was removed in text box, still the OK button is enabled - When length is zero , disable the OK button in pairing dialog - update fix to prevent error while mOkButton is not ceated. Change-Id: I38ff3029cff2e7c4e87b7f9c93fa262125e91d44 Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
* | | Merge "Adding temporary setting for enabling touch exploration."Svetoslav Ganov2011-07-181-0/+15
|\ \ \ | |/ / |/| |
| * | Adding temporary setting for enabling touch exploration.Svetoslav Ganov2011-07-151-0/+15
| | | | | | | | | | | | Change-Id: I81cef6f3bf4e533da1082bf836a74e38fe718af3
* | | Merge "Data usage app bars, draw estimated cycle usage."Jeff Sharkey2011-07-172-11/+72
|\ \ \
| * | | Data usage app bars, draw estimated cycle usage.Jeff Sharkey2011-07-172-11/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show application list with normalized percentage data usage as horizontal bar chart. Draw estimated usage for remainder of cycle to reinforce log scale, and break out received/sent when showing app details. Bug: 5038591, 4948713, 4818025 Change-Id: Ib71e73d4f692adc7fe8ae87edd0cec2a8f3976d3
* | | | Merge "Fix NPE in MasterClear"Amith Yamasani2011-07-171-4/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix NPE in MasterClearAmith Yamasani2011-07-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5008299 Change-Id: If2d02af7ecda7fe40445a3ec8e023138c5523fd6
* | | | Settings crash if android:settingsActivity AccessibilityServiceInfo XML is ↵Svetoslav Ganov2011-07-172-11/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incorrect. 1. The code was not checking whether the settings activity exists before passing in to the SettingCheckboxClass. bug:5038386 Change-Id: Iba4f5e2e5f6f3ed9c0fed5a5103d2e9a34399d97
* | | Merge "Add Settings item to select sound effects control panel."Marco Nelissen2011-07-151-0/+23
|\ \ \
| * | | Add Settings item to select sound effects control panel.Marco Nelissen2011-07-151-0/+23
| | | | | | | | | | | | | | | | Change-Id: I7952aad3afbc9dea8ea54be9afcad7969a0f23bc
* | | | Upgrade Bluetooth pairing dialogs for ICS.Jake Hamby2011-07-1510-337/+485
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change Bluetooth pairing dialogs to match ICS wireframes. * Default to numeric soft keyboard for PIN entry, and add checkbox to allow user to switch to alphanumeric keyboard if necessary. * Move all Bluetooth advanced settings into action bar menu. * Toggle visibility by touching "My device" entry in devices list. Change-Id: Ic2377eb4364f41d215181cb1e3933997c9db9106
* | | | VpnSettings: use the real passwords instead of dummy strings.Chia-chi Yeh2011-07-151-19/+8
| | | | | | | | | | | | | | | | Change-Id: Ib14350364740efe5529fa9ee264c69f91c06a538
* | | | Merge "VpnSettings: bind OnPreferenceClickListener later."Chia-chi Yeh2011-07-151-7/+4
|\ \ \ \
| * | | | VpnSettings: bind OnPreferenceClickListener later.Chia-chi Yeh2011-07-151-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4999108 Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
* | | | | Merge "Polishing accessibility tutorial UI."Svetoslav Ganov2011-07-151-16/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Polishing accessibility tutorial UI.Alan Viverette2011-07-151-16/+31
| | |/ / | |/| | | | | | | | | | Change-Id: I059f00e94cdc906935b2d42a505f31512dd99668
* | | | Merge "No split action bar in screens with one action"Gilles Debunne2011-07-154-15/+17
|\ \ \ \
| * | | | No split action bar in screens with one actionGilles Debunne2011-07-114-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5012012 Change-Id: I87d38e0cc97762aa9043b0c5834a42848cc2a0fe
* | | | | Merge "VpnSettings: enable MPPE by default."Chia-chi Yeh2011-07-141-1/+1
|\ \ \ \ \
| * | | | | VpnSettings: enable MPPE by default.Chia-chi Yeh2011-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
* | | | | | More data usage radio combinations, testing.Jeff Sharkey2011-07-142-71/+133
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Offer Ethernet data when present, and better handling of devices with various radio combinations. Include "setprop" to help testing in future. Adopt new NetworkTemplate building in framework, and avoid crash when AsyncTask finishes after Fragment is removed. Bug: 5026016, 5029874 Change-Id: Ib7ab501d0111b9860a91c248193919663d47f2a2
* | | | | Merge "Follow change in load average service."Dianne Hackborn2011-07-141-1/+3
|\ \ \ \ \
| * | | | | Follow change in load average service.Dianne Hackborn2011-07-141-1/+3
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I7d415a140598ef582842f1babdbc88b0e7be3ea9
* | | | | Merge "VpnSettings: generate arguments for IPSec XAUTH VPNs."Chia-chi Yeh2011-07-141-11/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | VpnSettings: generate arguments for IPSec XAUTH VPNs.Chia-chi Yeh2011-07-141-11/+46
| | |/ / | |/| | | | | | | | | | Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
* | | | am f70f60c4: am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE due to ↵Dianne Hackborn2011-07-141-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing ProcessItem.mPackageInfo" * commit 'f70f60c4dcfa576ea4ca9eda88eb1f258d1b38f1': Fix NPE due to missing ProcessItem.mPackageInfo
| * \ \ \ am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE due to missing ↵Dianne Hackborn2011-07-141-1/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProcessItem.mPackageInfo" * commit '7d19d795c8d7a5692879523d8179a8a46226bbbc': Fix NPE due to missing ProcessItem.mPackageInfo
| | * \ \ \ am c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"Dianne Hackborn2011-07-131-1/+12
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c74500f44e3673b7728c2f619ee3d61a73ad5526': Fix NPE due to missing ProcessItem.mPackageInfo
| | | * | | | Fix NPE due to missing ProcessItem.mPackageInfoJohannes Carlsson2011-07-011-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason was that a item was removed from the SparseArray while iterating it causing one ProcessItem to be skipped in the loop which makes sure that mPackageInfo is not null. This happens when all processes for one uid is stopped and a new process is created. This problem was found by running monkey. Change-Id: I5e9a76e8007819d5e6d9ba15af0c2362da193526
| | * | | | | am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbreadJaikumar Ganesh2011-06-212-0/+265
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf': DO NOT MERGE Show user dialog for BT.
| | | * \ \ \ \ Merge "DO NOT MERGE Show user dialog for BT." into gingerbreadJaikumar Ganesh2011-06-212-0/+265
| | | |\ \ \ \ \
| | | | * | | | | DO NOT MERGE Show user dialog for BT.Jaikumar Ganesh2011-06-202-0/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show user dialog for incoming BT connection requests from unknown devices. Contribution by: Wei (Matthew) Xie Change-Id: I7e9e8bbbd8808a7569f84d213fa3d716f7f5bc80
| | * | | | | | | am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT ↵Jaikumar Ganesh2011-05-272-15/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into gingerbread * commit 'eddb21a2ebd39900893da63749a00570f37e5038': Changes for API of Bluetooth Discoverability. DO NOT MERGE
| | | * | | | | | Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into ↵Jaikumar Ganesh2011-05-272-15/+5
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | | * | | | | | Changes for API of Bluetooth Discoverability. DO NOT MERGEJaikumar Ganesh2011-05-272-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Apps can ask for any time between 0 and 3600 secs 2. O implies always discoverable 3. Any invalid values will default to the default - 120 secs. A dialog is shown by the system to the users to accept the change in discoverability values. Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
| | * | | | | | | | am c955d8ee: Merge "Allow users to change the length of BT disoverability. ↵Jaikumar Ganesh2011-05-274-29/+100
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE" into gingerbread * commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058': Allow users to change the length of BT disoverability. DO NOT MERGE
| | | * | | | | | | Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" ↵Jaikumar Ganesh2011-05-274-29/+100
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | | * | | | | | Allow users to change the length of BT disoverability. DO NOT MERGEChris Wren2011-05-274-29/+100
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can set to be two minues, five minutes, an hour, or forever discoverable. The default is 120 secs. This addresses the internal bug 2413429: http://b/issue?id=2413429 and external issue 6348: http://code.google.com/p/android/issues/detail?id=6348 Original Author: Chris Wren <crwen@google.com> Modifications done by: Jaikumar Ganesh<jaikumar@google.com> Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
* | | | | | | | | Merge "Various small fixes to the debugging settings."Dianne Hackborn2011-07-141-20/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Various small fixes to the debugging settings.Dianne Hackborn2011-07-141-20/+30
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also tweak to follow changes in activity manager. Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
* | | | | | | | | am 25bd33e1: am d7b2dccb: Display IMEI and ICCID for LTE device.John Wang2011-07-141-21/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | * commit '25bd33e1cfb753ff0a118e6c84f6e23163713b69': Display IMEI and ICCID for LTE device.
| * | | | | | | am d7b2dccb: Display IMEI and ICCID for LTE device.John Wang2011-07-131-21/+31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7b2dccbe60a02965186d28f0b671ef1c419a2a8': Display IMEI and ICCID for LTE device.