Mike Lockwood
b8370359a7
Merge "USB: Toggle installer CD menu title when installer CD is enabled/disabled"
2011-07-18 15:59:25 -07:00
Mike Lockwood
6d11dc5c8c
USB: Toggle installer CD menu title when installer CD is enabled/disabled
...
Bug: 5032789
Change-Id: I0710133b2318147c7556e9f970f4443511ee1729
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-07-18 15:58:46 -07:00
jhtop.kim
298365bbf3
Bluetooth : Fix for changing the BT device icon if the calss is null (mouse)
...
- 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 >
2011-07-18 15:54:14 -07:00
jhtop.kim
01525c9a05
Bluetooth : fix to finish deviceprofilesettings activity when device is not bonded
...
- if cached device state is "BluetoothDevice.BOND_NONE" then finish activity
Change-Id: I5c981e8c4800c10f1f8570668794301d5da03188
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com >
2011-07-18 15:49:12 -07:00
jhtop.kim
5ab6b6b004
Bluetooth : fix UI bug: Disable "OK" button if friendly name is null
...
- 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 >
2011-07-18 15:44:14 -07:00
jhtop.kim
2affa6b28d
Bluetooth : UI bug fix : Pairing dialog box takes space as character
...
- 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 >
2011-07-18 15:32:25 -07:00
Svetoslav Ganov
93a727d5d5
Merge "Adding temporary setting for enabling touch exploration."
2011-07-18 12:57:35 -07:00
Alan Viverette
2d719ce9dc
Updated touch exploration tutorial strings.
...
Change-Id: I14f1caff8a7956da342f44b74c2de6a0b7d5abc0
2011-07-18 11:09:59 -07:00
The Android Automerger
33af51862a
merge in ics-release history after reset to master
2011-07-18 06:43:18 -07:00
Jeff Sharkey
ae2f9979ca
Merge "Data usage app bars, draw estimated cycle usage."
2011-07-17 20:38:12 -07:00
Jeff Sharkey
2412b0f248
Data usage app bars, draw estimated cycle usage.
...
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
2011-07-17 20:31:54 -07:00
Amith Yamasani
7f4db23959
Merge "Fix NPE in MasterClear"
2011-07-17 12:36:39 -07:00
The Android Automerger
e2fd50a50a
merge in ics-release history after reset to master
2011-07-17 12:19:27 -07:00
Svetoslav Ganov
abc95ee822
Settings crash if android:settingsActivity AccessibilityServiceInfo XML is incorrect.
...
1. The code was not checking whether the settings activity exists
before passing in to the SettingCheckboxClass.
bug:5038386
Change-Id: Iba4f5e2e5f6f3ed9c0fed5a5103d2e9a34399d97
2011-07-17 11:35:08 -07:00
Amith Yamasani
07d6fd2c01
Fix NPE in MasterClear
...
Bug: 5008299
Change-Id: If2d02af7ecda7fe40445a3ec8e023138c5523fd6
2011-07-17 11:30:28 -07:00
Eric Fischer
e686c4dec6
Merge "Import revised translations."
2011-07-15 17:01:11 -07:00
Eric Fischer
4c9b51058b
Import revised translations.
...
Change-Id: I20dc393d0567de43b34caf9556eba6e862ac617b
2011-07-15 16:51:20 -07:00
Marco Nelissen
fc6b01e6b4
Merge "Add Settings item to select sound effects control panel."
2011-07-15 16:16:31 -07:00
Marco Nelissen
6eca4b3b92
Add Settings item to select sound effects control panel.
...
Change-Id: I7952aad3afbc9dea8ea54be9afcad7969a0f23bc
2011-07-15 15:59:41 -07:00
Jake Hamby
ca9812a852
Upgrade Bluetooth pairing dialogs for ICS.
...
* 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
2011-07-15 15:39:53 -07:00
Chia-chi Yeh
aa5b531b0b
VpnSettings: use the real passwords instead of dummy strings.
...
Change-Id: Ib14350364740efe5529fa9ee264c69f91c06a538
2011-07-15 14:59:18 -07:00
Svetoslav Ganov
37d04f748f
Adding temporary setting for enabling touch exploration.
...
Change-Id: I81cef6f3bf4e533da1082bf836a74e38fe718af3
2011-07-15 14:26:53 -07:00
Alan Viverette
a4e101b24b
Fixing build-breaking typo.
...
Change-Id: Ia332301d9589a5497c5b675628810cae5bbbf7df
2011-07-15 11:43:27 -07:00
Chia-chi Yeh
9ed5444212
Merge "VpnSettings: bind OnPreferenceClickListener later."
2011-07-15 11:36:52 -07:00
Chia-chi Yeh
d501b5c963
VpnSettings: bind OnPreferenceClickListener later.
...
Bug: 4999108
Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
2011-07-15 11:35:54 -07:00
Gilles Debunne
3dba8d527f
Merge "Fix for QUICK_LAUNCH_SETTINGS intent"
2011-07-15 11:04:08 -07:00
Svetoslav Ganov
6c390fc6ae
Merge "Polishing accessibility tutorial UI."
2011-07-15 11:00:54 -07:00
Alan Viverette
0a08e1fcbd
Polishing accessibility tutorial UI.
...
Change-Id: I059f00e94cdc906935b2d42a505f31512dd99668
2011-07-15 10:45:16 -07:00
Gilles Debunne
42a7a7112f
Merge "No split action bar in screens with one action"
2011-07-15 09:41:30 -07:00
The Android Automerger
1a43985d5c
merge in ics-release history after reset to master
2011-07-15 06:45:38 -07:00
Chia-chi Yeh
dcfb7f3f60
Merge "VpnSettings: enable MPPE by default."
2011-07-14 23:09:58 -07:00
Chia-chi Yeh
0fe97ebcd8
VpnSettings: enable MPPE by default.
...
Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
2011-07-14 23:08:33 -07:00
Jeff Sharkey
9549e9f377
More data usage radio combinations, testing.
...
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
2011-07-14 20:43:30 -07:00
Dianne Hackborn
45c04be1f6
Merge "Follow change in load average service."
2011-07-14 18:29:12 -07:00
Gilles Debunne
201071cd37
Fix for QUICK_LAUNCH_SETTINGS intent
...
Added android.settings.QUICK_LAUNCH_SETTINGS as a new action name.
This is how it is referenced in public framework's Settings.
Kept the com.android version for backward compatibility.
Change-Id: I8ce2ff9de86ec20dbc1e9a89f971d2b2219a70f9
2011-07-14 18:03:07 -07:00
Dianne Hackborn
c5ec5be6e4
Follow change in load average service.
...
Change-Id: I7d415a140598ef582842f1babdbc88b0e7be3ea9
2011-07-14 17:23:58 -07:00
Chia-chi Yeh
403d7fe526
Merge "VpnSettings: generate arguments for IPSec XAUTH VPNs."
2011-07-14 15:24:25 -07:00
Chia-chi Yeh
f35130dd79
VpnSettings: generate arguments for IPSec XAUTH VPNs.
...
Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
2011-07-14 15:16:51 -07:00
Dianne Hackborn
6c21377ff7
am f70f60c4
: am 7d19d795
: am b41b85dc
: am c74500f4
: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
...
* commit 'f70f60c4dcfa576ea4ca9eda88eb1f258d1b38f1':
Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-14 10:56:31 -07:00
Dianne Hackborn
5231e3d70d
Merge "Various small fixes to the debugging settings."
2011-07-14 10:54:19 -07:00
John Wang
53c8c1b8e7
am 25bd33e1
: am d7b2dccb
: Display IMEI and ICCID for LTE device.
...
* commit '25bd33e1cfb753ff0a118e6c84f6e23163713b69':
Display IMEI and ICCID for LTE device.
2011-07-14 10:53:03 -07:00
Dianne Hackborn
f70f60c4dc
am 7d19d795
: am b41b85dc
: am c74500f4
: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
...
* commit '7d19d795c8d7a5692879523d8179a8a46226bbbc':
Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-14 09:18:01 -07:00
Dianne Hackborn
83b09a57e1
Various small fixes to the debugging settings.
...
Also tweak to follow changes in activity manager.
Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
2011-07-14 00:54:39 -07:00
Dianne Hackborn
7d19d795c8
am b41b85dc
: am c74500f4
: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
...
* commit 'b41b85dc9b9fe1ee9adb84186c672dcc5a92e9a8':
Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-13 16:52:15 -07:00
Dianne Hackborn
b41b85dc9b
am c74500f4
: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
...
* commit 'c74500f44e3673b7728c2f619ee3d61a73ad5526':
Fix NPE due to missing ProcessItem.mPackageInfo
2011-07-13 16:50:07 -07:00
Dianne Hackborn
c74500f44e
Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
2011-07-13 16:36:23 -07:00
John Wang
25bd33e1cf
am d7b2dccb
: Display IMEI and ICCID for LTE device.
...
* commit 'd7b2dccbe60a02965186d28f0b671ef1c419a2a8':
Display IMEI and ICCID for LTE device.
2011-07-13 10:54:17 -07:00
John Wang
d7b2dccbe6
Display IMEI and ICCID for LTE device.
...
Display IMEI nad ICCID in About tablet / Status for LTE devices.
bug:4983512
bug:5001888
Change-Id: I4c418b159b49bef96acd5ef300c9b71379821d1b
2011-07-13 10:25:29 -07:00
The Android Automerger
0e6386eb9d
merge in ics-release history after reset to master
2011-07-13 07:47:23 -07:00
Jeff Sharkey
1aa671cba7
Merge "Data usage app labels and system clustering."
2011-07-12 20:23:08 -07:00