OSDN Git Service
The Android Automerger [Wed, 20 Jul 2011 13:47:26 +0000 (06:47 -0700)]
merge in ics-release history after reset to master
Dianne Hackborn [Wed, 20 Jul 2011 01:07:51 +0000 (18:07 -0700)]
Merge "Fix issue #
4976176: Font size setting does not persist"
Dianne Hackborn [Tue, 19 Jul 2011 21:59:01 +0000 (14:59 -0700)]
Fix issue #
4976176: Font size setting does not persist
Change-Id: Ie36c97680f43414b5cdc1615519527ba5e8fa902
The Android Automerger [Tue, 19 Jul 2011 13:47:21 +0000 (06:47 -0700)]
merge in ics-release history after reset to master
Dianne Hackborn [Tue, 19 Jul 2011 01:11:46 +0000 (18:11 -0700)]
Merge "Fix issue #
4999758: Disabling a system app should require..."
Gilles Debunne [Tue, 19 Jul 2011 00:46:54 +0000 (17:46 -0700)]
Merge "Removed summary text and categories in Wireless settings"
Dianne Hackborn [Mon, 18 Jul 2011 23:18:34 +0000 (16:18 -0700)]
Fix issue #
4999758: Disabling a system app should require...
...a scary sounding confirmation
Change-Id: I88b14a95b804f14d25a9efcb04b282d60f9719c3
Mike Lockwood [Mon, 18 Jul 2011 22:59:25 +0000 (15:59 -0700)]
Merge "USB: Toggle installer CD menu title when installer CD is enabled/disabled"
Mike Lockwood [Mon, 18 Jul 2011 17:59:10 +0000 (10:59 -0700)]
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>
jhtop.kim [Mon, 18 Jul 2011 02:03:09 +0000 (11:03 +0900)]
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>
jhtop.kim [Sun, 17 Jul 2011 05:32:40 +0000 (14:32 +0900)]
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>
jhtop.kim [Fri, 15 Jul 2011 12:51:04 +0000 (21:51 +0900)]
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>
jhtop.kim [Mon, 18 Jul 2011 14:42:37 +0000 (23:42 +0900)]
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>
Svetoslav Ganov [Mon, 18 Jul 2011 19:57:35 +0000 (12:57 -0700)]
Merge "Adding temporary setting for enabling touch exploration."
Alan Viverette [Mon, 18 Jul 2011 18:09:59 +0000 (11:09 -0700)]
Updated touch exploration tutorial strings.
Change-Id: I14f1caff8a7956da342f44b74c2de6a0b7d5abc0
The Android Automerger [Mon, 18 Jul 2011 13:43:18 +0000 (06:43 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Mon, 18 Jul 2011 03:38:12 +0000 (20:38 -0700)]
Merge "Data usage app bars, draw estimated cycle usage."
Jeff Sharkey [Mon, 18 Jul 2011 03:31:40 +0000 (20:31 -0700)]
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
Amith Yamasani [Sun, 17 Jul 2011 19:36:39 +0000 (12:36 -0700)]
Merge "Fix NPE in MasterClear"
The Android Automerger [Sun, 17 Jul 2011 19:19:27 +0000 (12:19 -0700)]
merge in ics-release history after reset to master
Svetoslav Ganov [Sun, 17 Jul 2011 17:08:34 +0000 (10:08 -0700)]
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
Amith Yamasani [Sat, 16 Jul 2011 01:37:16 +0000 (18:37 -0700)]
Fix NPE in MasterClear
Bug:
5008299
Change-Id: If2d02af7ecda7fe40445a3ec8e023138c5523fd6
Eric Fischer [Sat, 16 Jul 2011 00:01:11 +0000 (17:01 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 15 Jul 2011 23:51:20 +0000 (16:51 -0700)]
Import revised translations.
Change-Id: I20dc393d0567de43b34caf9556eba6e862ac617b
Marco Nelissen [Fri, 15 Jul 2011 23:16:31 +0000 (16:16 -0700)]
Merge "Add Settings item to select sound effects control panel."
Marco Nelissen [Fri, 15 Jul 2011 22:02:03 +0000 (15:02 -0700)]
Add Settings item to select sound effects control panel.
Change-Id: I7952aad3afbc9dea8ea54be9afcad7969a0f23bc
Jake Hamby [Tue, 12 Jul 2011 18:05:46 +0000 (11:05 -0700)]
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
Chia-chi Yeh [Fri, 15 Jul 2011 21:59:18 +0000 (14:59 -0700)]
VpnSettings: use the real passwords instead of dummy strings.
Change-Id: Ib14350364740efe5529fa9ee264c69f91c06a538
Svetoslav Ganov [Fri, 15 Jul 2011 21:26:46 +0000 (14:26 -0700)]
Adding temporary setting for enabling touch exploration.
Change-Id: I81cef6f3bf4e533da1082bf836a74e38fe718af3
Alan Viverette [Fri, 15 Jul 2011 18:43:27 +0000 (11:43 -0700)]
Fixing build-breaking typo.
Change-Id: Ia332301d9589a5497c5b675628810cae5bbbf7df
Chia-chi Yeh [Fri, 15 Jul 2011 18:36:52 +0000 (11:36 -0700)]
Merge "VpnSettings: bind OnPreferenceClickListener later."
Chia-chi Yeh [Fri, 15 Jul 2011 18:05:46 +0000 (11:05 -0700)]
VpnSettings: bind OnPreferenceClickListener later.
Bug:
4999108
Change-Id: Idab3029a30943d1118584e6a1b01db96340858ed
Gilles Debunne [Fri, 15 Jul 2011 18:04:08 +0000 (11:04 -0700)]
Merge "Fix for QUICK_LAUNCH_SETTINGS intent"
Svetoslav Ganov [Fri, 15 Jul 2011 18:00:54 +0000 (11:00 -0700)]
Merge "Polishing accessibility tutorial UI."
Alan Viverette [Fri, 15 Jul 2011 17:45:16 +0000 (10:45 -0700)]
Polishing accessibility tutorial UI.
Change-Id: I059f00e94cdc906935b2d42a505f31512dd99668
Gilles Debunne [Fri, 15 Jul 2011 16:41:30 +0000 (09:41 -0700)]
Merge "No split action bar in screens with one action"
The Android Automerger [Fri, 15 Jul 2011 13:45:38 +0000 (06:45 -0700)]
merge in ics-release history after reset to master
Chia-chi Yeh [Fri, 15 Jul 2011 06:09:58 +0000 (23:09 -0700)]
Merge "VpnSettings: enable MPPE by default."
Chia-chi Yeh [Fri, 15 Jul 2011 06:08:33 +0000 (23:08 -0700)]
VpnSettings: enable MPPE by default.
Change-Id: I0e8ec0ec4d233081d6b06d14f82e2c56d9ae0642
Jeff Sharkey [Fri, 15 Jul 2011 03:01:13 +0000 (20:01 -0700)]
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
Dianne Hackborn [Fri, 15 Jul 2011 01:29:12 +0000 (18:29 -0700)]
Merge "Follow change in load average service."
Gilles Debunne [Fri, 15 Jul 2011 01:03:06 +0000 (18:03 -0700)]
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
Dianne Hackborn [Fri, 15 Jul 2011 00:23:58 +0000 (17:23 -0700)]
Follow change in load average service.
Change-Id: I7d415a140598ef582842f1babdbc88b0e7be3ea9
Chia-chi Yeh [Thu, 14 Jul 2011 22:24:25 +0000 (15:24 -0700)]
Merge "VpnSettings: generate arguments for IPSec XAUTH VPNs."
Chia-chi Yeh [Thu, 14 Jul 2011 22:16:51 +0000 (15:16 -0700)]
VpnSettings: generate arguments for IPSec XAUTH VPNs.
Change-Id: I70d5e93f0d431d9d6cc64324ce2c37129d1a2a88
Dianne Hackborn [Thu, 14 Jul 2011 17:56:31 +0000 (10:56 -0700)]
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
Dianne Hackborn [Thu, 14 Jul 2011 17:54:19 +0000 (10:54 -0700)]
Merge "Various small fixes to the debugging settings."
John Wang [Thu, 14 Jul 2011 17:53:03 +0000 (10:53 -0700)]
am
25bd33e1: am
d7b2dccb: Display IMEI and ICCID for LTE device.
* commit '
25bd33e1cfb753ff0a118e6c84f6e23163713b69':
Display IMEI and ICCID for LTE device.
Dianne Hackborn [Thu, 14 Jul 2011 16:18:01 +0000 (09:18 -0700)]
am
7d19d795: am
b41b85dc: am
c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '
7d19d795c8d7a5692879523d8179a8a46226bbbc':
Fix NPE due to missing ProcessItem.mPackageInfo
Dianne Hackborn [Thu, 14 Jul 2011 02:36:06 +0000 (19:36 -0700)]
Various small fixes to the debugging settings.
Also tweak to follow changes in activity manager.
Change-Id: Icd3fdff69dfc9e4c027d904ae95da3fb9bd65152
Dianne Hackborn [Wed, 13 Jul 2011 23:52:15 +0000 (16:52 -0700)]
am
b41b85dc: am
c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '
b41b85dc9b9fe1ee9adb84186c672dcc5a92e9a8':
Fix NPE due to missing ProcessItem.mPackageInfo
Dianne Hackborn [Wed, 13 Jul 2011 23:50:07 +0000 (16:50 -0700)]
am
c74500f4: Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
* commit '
c74500f44e3673b7728c2f619ee3d61a73ad5526':
Fix NPE due to missing ProcessItem.mPackageInfo
Dianne Hackborn [Wed, 13 Jul 2011 23:36:23 +0000 (16:36 -0700)]
Merge "Fix NPE due to missing ProcessItem.mPackageInfo"
John Wang [Wed, 13 Jul 2011 17:54:17 +0000 (10:54 -0700)]
am
d7b2dccb: Display IMEI and ICCID for LTE device.
* commit '
d7b2dccbe60a02965186d28f0b671ef1c419a2a8':
Display IMEI and ICCID for LTE device.
John Wang [Tue, 12 Jul 2011 00:05:04 +0000 (17:05 -0700)]
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
The Android Automerger [Wed, 13 Jul 2011 14:47:23 +0000 (07:47 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Wed, 13 Jul 2011 03:23:08 +0000 (20:23 -0700)]
Merge "Data usage app labels and system clustering."
Jeff Sharkey [Wed, 13 Jul 2011 03:20:46 +0000 (20:20 -0700)]
Data usage app labels and system clustering.
Cluster all non-applications under single "Android OS" label, and
correctly label uninstalled applications. Match API changes that now
return correct historical usage around current time.
Bug:
4975314,
4691901
Change-Id: Icec1c54ff3404e1525878516b0a438f757dcb758
Svetoslav Ganov [Wed, 13 Jul 2011 00:45:45 +0000 (17:45 -0700)]
Merge "Added touch exploration tutorial to Accessibility settings."
Alan Viverette [Wed, 13 Jul 2011 00:34:22 +0000 (17:34 -0700)]
Added touch exploration tutorial to Accessibility settings.
Change-Id: Ic11f7c41e40de2b32f5815dbc3396a308c451c5b
Svetoslav Ganov [Tue, 12 Jul 2011 22:21:06 +0000 (15:21 -0700)]
Merge "Accessibility settings - divider should be hidden"
Svetoslav Ganov [Tue, 12 Jul 2011 22:01:15 +0000 (15:01 -0700)]
Accessibility settings - divider should be hidden
bug:
5009004
Change-Id: If69d7a94857308ab07ea78d3c68978449bf333c9
Jeff Sharkey [Tue, 12 Jul 2011 20:53:11 +0000 (13:53 -0700)]
Migrate to refactored NetworkStats API.
Change-Id: I76452a67b74df873c88cb9092188e5e4ba83b991
The Android Automerger [Tue, 12 Jul 2011 13:41:16 +0000 (06:41 -0700)]
merge in ics-release history after reset to master
satok [Mon, 11 Jul 2011 22:23:36 +0000 (07:23 +0900)]
Change IME picker dialog from Activity to Broadcast
Change-Id: I7bc3c3aa5544f3cb170703d6e71bad1bd54545b8
Gilles Debunne [Mon, 11 Jul 2011 21:13:31 +0000 (14:13 -0700)]
No split action bar in screens with one action
Bug
5012012
Change-Id: I87d38e0cc97762aa9043b0c5834a42848cc2a0fe
Gilles Debunne [Mon, 11 Jul 2011 17:10:30 +0000 (10:10 -0700)]
Merge "Storage correctly updates internal storage graph."
The Android Automerger [Mon, 11 Jul 2011 13:45:10 +0000 (06:45 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Mon, 11 Jul 2011 01:56:30 +0000 (18:56 -0700)]
Force poll on data usage launch.
When lauching data usage, force NetworkStatsService poll to update
with recent data. Also move UID summary data to Loader pattern.
Bug:
4515856
Change-Id: Ia8c70d8d0c863da3b8e956e4066d4f69fba30473
Jeff Sharkey [Sun, 10 Jul 2011 19:23:55 +0000 (12:23 -0700)]
Prevent data usage chart sweeps from crossing.
Add rules to clamp sweeps, since it doesn't make sense to have a
limit below warning.
Bug:
4598462
Change-Id: I3323c7bca7fabe3e3f1e9c89906c3a921103579c
The Android Automerger [Sun, 10 Jul 2011 13:46:54 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Sun, 10 Jul 2011 00:52:31 +0000 (17:52 -0700)]
Roaming and background controls under data usage.
Add action items to control mobile data roaming and background data
controls, along with dialogs to confirm. Still need to fix telephony
to watch for Settings.Secure changes.
Hide "Change cycle" item when viewing app details. Handle special
case where data usage doesn't want split action bar.
Bug:
4818009,
4979025,
4948767,
5010948
Change-Id: I363ff76a9daf2528d81573cf8d0687719d664bb0
Jeff Sharkey [Sat, 9 Jul 2011 21:24:00 +0000 (14:24 -0700)]
Merge "Draw vertical data usage sweep labels."
Jeff Sharkey [Sat, 9 Jul 2011 08:02:56 +0000 (01:02 -0700)]
Draw vertical data usage sweep labels.
Using template string, ask axis to build label for sweeps. Also
clean up margins exposed to parent view, since we offset when label
is larger than sweep drawable.
Bug:
4598460
Change-Id: If71bc8ec8c952023325c80b9bc00b63c23609c7a
Gilles Debunne [Fri, 8 Jul 2011 23:05:09 +0000 (16:05 -0700)]
Storage correctly updates internal storage graph.
The estimated used size used to be displayed next to the actual applications' size.
Change-Id: I9a9bf1faf638f8495507930e531ca4c851558f26
Gilles Debunne [Fri, 8 Jul 2011 23:01:57 +0000 (16:01 -0700)]
Merge "Changed Settings application theme"
The Android Automerger [Fri, 8 Jul 2011 21:11:09 +0000 (14:11 -0700)]
merge in ics-release history after reset to master
Gilles Debunne [Fri, 8 Jul 2011 18:57:40 +0000 (11:57 -0700)]
Changed Settings application theme
Change-Id: I3c3612fb352b1ef10b3342b9ad8f0306bc787da8
Gilles Debunne [Fri, 8 Jul 2011 16:40:00 +0000 (09:40 -0700)]
Bug
5003461 - Removed animation option
Associated change in DatabaseHelper to reset this value in the database.
Change-Id: I530da617c44773fad31e62f595d0c335daf64148
Gilles Debunne [Fri, 8 Jul 2011 01:23:04 +0000 (18:23 -0700)]
Removed summary text and categories in Wireless settings
Bug
5002377 and
5002476.
Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
Gilles Debunne [Thu, 7 Jul 2011 21:24:26 +0000 (14:24 -0700)]
Refactor Bluetooth settings
Two lists: paired devices and available devices.
New item at top for the device itself (not connected to discoverable, this is a larger
refactoring).
New settings icon.
Change-Id: I788a6c0afdb07309d449a4d41a02cf8480c95a37
Gilles Debunne [Thu, 7 Jul 2011 23:04:53 +0000 (16:04 -0700)]
Merge "Changed text and appearance when Wifi/Bluetooth is off"
Gilles Debunne [Thu, 30 Jun 2011 19:00:28 +0000 (12:00 -0700)]
Changed text and appearance when Wifi/Bluetooth is off
A TextView is used as an empty view, centered on screen with the message.
Change-Id: I33825775d6b2ed212e5839cfac84d055b9336667
Gilles Debunne [Thu, 7 Jul 2011 22:59:18 +0000 (15:59 -0700)]
Merge "Fixed intents to start Settings activities"
Eric Fischer [Thu, 7 Jul 2011 21:51:58 +0000 (14:51 -0700)]
Merge "Import revised translations."
Chia-chi Yeh [Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)]
Merge "VpnSettings: pass certificates to racoon directly."
Chia-chi Yeh [Thu, 7 Jul 2011 19:49:18 +0000 (12:49 -0700)]
VpnSettings: pass certificates to racoon directly.
Also fix some style issues.
Change-Id: I7ca46d0cc3038f21ef5904d4515e90907a21d613
Matthew Xie [Thu, 7 Jul 2011 19:27:41 +0000 (12:27 -0700)]
Merge "Show user dialog for BT connection and phonebook access"
Eric Fischer [Thu, 7 Jul 2011 18:49:07 +0000 (11:49 -0700)]
Import revised translations.
Change-Id: I9f305f5f3c37e90022e21deb5cf262484a5360de
Gilles Debunne [Wed, 6 Jul 2011 20:10:16 +0000 (13:10 -0700)]
Fixed intents to start Settings activities
All tested, on tablet and on phone.
Change-Id: I8ab206b9db61c7c3800fe9bff175e87baf97ed7c
The Android Automerger [Thu, 7 Jul 2011 13:46:06 +0000 (06:46 -0700)]
merge in ics-release history after reset to master
Brian Carlstrom [Wed, 6 Jul 2011 22:13:03 +0000 (15:13 -0700)]
Set progress bar to 0 when done so that will not come back as full
Change-Id: I766e852d029168433a0d47c93dc3110a053f712c
Brian Carlstrom [Wed, 6 Jul 2011 20:45:07 +0000 (13:45 -0700)]
Merge "Convert CA loading from spinning wheel to progress bar"
Brian Carlstrom [Wed, 6 Jul 2011 20:15:03 +0000 (13:15 -0700)]
Convert CA loading from spinning wheel to progress bar
Change-Id: I3d9d596cbdf3ac4751b7b2e297faa0f667d2de02
Brian Carlstrom [Wed, 6 Jul 2011 19:06:20 +0000 (12:06 -0700)]
Merge "Improved presentation of CA list"
Brian Carlstrom [Wed, 6 Jul 2011 06:51:39 +0000 (23:51 -0700)]
Improved presentation of CA list
Change-Id: Ibc6dd9d553c3f7f53453fb43e9842afe789d8b50
Mike Lockwood [Thu, 30 Jun 2011 18:47:46 +0000 (14:47 -0400)]
Super rough implementation of new USB settings
There does not seem to be a way to implement radio buttons in a settings screen,
so I am using check boxes as a temporary hack.
Change-Id: I2d2c7931f689ff04608662b64aafc4862cfef48e
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Automerger [Mon, 4 Jul 2011 13:47:58 +0000 (06:47 -0700)]
merge in ics-release history after reset to master
Chia-chi Yeh [Mon, 4 Jul 2011 10:38:18 +0000 (03:38 -0700)]
Merge "VpnSettings: add status report."
Chia-chi Yeh [Mon, 4 Jul 2011 10:17:33 +0000 (03:17 -0700)]
VpnSettings: add status report.
Change-Id: Ia050d997524b39868e6acce82d12b0415909ab77