Commit Graph

5549 Commits

Author SHA1 Message Date
Ryan PC Gibson
9cb97c44ee Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread 2011-08-30 09:04:44 -07:00
The Android Automerger
590de2d670 merge in ics-release history after reset to master 2011-08-30 06:34:33 -07:00
Claudia de Veaux
abc541a7bf Shorten data usage settings label so it won't truncate.
Bug: 5226216

Change-Id: I4e6444b3304869a6d8c5f7085632c4d6dd57ca28
2011-08-29 19:37:31 -07:00
Ben Komalo
9fcb6a7fac Misc fixes to CryptKeeper
- use standard IME, but force it into ASCII if it's the default IME
- provide an IME switcher if there are multiple IME's, in case the
ASCII-capable one is a different one
- make the IME shown by default

Bug: 5004456
Bug: 4698473
Change-Id: Id40a164cfe599bfdb67b81f60d4ab8a52208de88
2011-08-29 15:14:18 -07:00
Svetoslav Ganov
e6fecb2ee5 Merge "Added accessibility tutorial-specific class name for instructions." 2011-08-29 14:51:28 -07:00
Jeff Brown
87deb741a7 Merge "Add a "show touches" option for demos and presentations. Bug: 4569045" 2011-08-29 14:04:25 -07:00
Dianne Hackborn
c883ee5eaa Small improvements for issue #5225666
Sort disabled apps to the bottom of the list to make them easier to
find together.

Also change the order of the tabs because with the new layout anything
after the third tab is buried so put all apps at the end so the running
tab is more visible.

Change-Id: Id022fdbf366505cf0da3fb9a6270c3f2e2704d51
2011-08-29 12:31:14 -07:00
The Android Automerger
9cd76883f8 merge in ics-release history after reset to master 2011-08-29 06:34:37 -07:00
Jean Chalard
427a7ba104 Fix a crash in settings if a hard keyboard is attached.
For some reason the type of the options was wrong, but
otherwise it seems to work.

Bug: 5004175
Change-Id: I668b8bba1933aee6ad1243e446bd66c479bd6944
2011-08-29 19:21:23 +09:00
Jeff Sharkey
12b5c75312 Merge "Data usage UI fixes; sweeps, combined history." 2011-08-29 00:40:51 -07:00
Jeff Sharkey
55d18a57e4 Data usage UI fixes; sweeps, combined history.
Fix sweep z-order so that limit are always above inspection range,
and draw shadows behind sweep labels.  Narrower margins for sweeps
with labels; push labels to keep from overlapping.

Generous touch targets on sweeps, and delegate touches to neighboring
sweep if nearer.  Refresh sweep layout during axis zoom, and don't
allow zoom below default minimum.  Let inspection sweeps move beyond
valid data ranges.  Draw less-frequent tick marks when working with
large axis ranges.

Remove Wi-Fi policies but continue showing historical data.  Write
NetworkPolicy if modified during read, and snapshot when async write
requested.

Handle combined UID histories for "Android OS."

Bug: 5191421, 5092579, 5225988, 5221101, 5221065, 5221005, 5150906, 5058025
Change-Id: Id51652e8a10bb90e1345f7a8af01bd70cb8ac677
2011-08-28 16:34:25 -07:00
Irfan Sheriff
295141dc9e Merge "WifiSettings cleanup; emptyListi() instead of null" 2011-08-28 13:12:04 -07:00
Nick Pelly
0ef94804de Merge "Rename {zeroclick, share_tap} -> ndef_push in code." 2011-08-26 17:31:31 -07:00
Jeff Brown
f40770096f Add a "show touches" option for demos and presentations.
Bug: 4569045

Change-Id: Ie074dbdc61c8e30222113edebdb2e4d5a83020e5
2011-08-26 17:10:32 -07:00
Nick Pelly
0fb33abfb4 Rename {zeroclick, share_tap} -> ndef_push in code.
Not sure what the product name will be, but ndef push seems to be a
nice neutral name for the code.

Text strings are left as "Share Tap" for now.

Change-Id: I9dbf82eda2273220c23f443710a340c2c93e8291
2011-08-26 16:35:44 -07:00
Eric Fischer
295eb95588 Merge "Import revised translations." 2011-08-26 16:23:16 -07:00
Amith Yamasani
b9812022ea Avoid re-launching Keyguard warning dialog multiple times on orientation change.
Bug: 5211608
Change-Id: I13eb71fac954710bef8288294e96f9f60030ff6a
2011-08-26 15:51:29 -07:00
Eric Fischer
7f0c80608a Import revised translations.
Change-Id: I0916afa3320093422451fbe98bf6d6a0386a302d
2011-08-26 14:59:45 -07:00
Isaac Levy
cc38b49392 WifiSettings cleanup; emptyListi() instead of null
Change-Id: I0fced1f00ff259aed98988f0913383c50a3c6427
2011-08-26 14:29:22 -07:00
Irfan Sheriff
6dbfdf3800 Merge "Speeding up WifiSettings AP list printout" 2011-08-26 14:06:05 -07:00
satok
ef283b41b0 Add debug code to spell checker settings
Change-Id: Iab3bee33e4d6bd19c30e20591d6a2f08e1cff157
2011-08-26 18:01:07 +09:00
satok
e36f1c581b SpellChecker settings
Change-Id: I0d7af408d2b70e8e593e490484526dd8fffdc725
2011-08-26 16:03:19 +09:00
Isaac Levy
fdac5bae25 Speeding up WifiSettings AP list printout
Change-Id: Idc82ba7320469e05984ba6ac9f7d2cf927dfaa00
2011-08-25 19:31:20 -07:00
Jake Hamby
2aaf687aa6 Merge "Bluetooth : fix for showing paired device list error" 2011-08-25 15:14:47 -07:00
Irfan Sheriff
de58555d25 Merge "Fixed wifi refresh bug, b/5021754" 2011-08-25 14:04:03 -07:00
Isaac Levy
e2c6e7520b Fixed wifi refresh bug, b/5021754
Change-Id: I93711094ceb1490accce1e466de4cc1541dffdff
2011-08-25 12:13:19 -07:00
Irfan Sheriff
06285deb66 Merge "Update WifiP2pManager API use" 2011-08-25 11:50:46 -07:00
jhtop.kim
8abbaab8b3 Bluetooth : fix for showing paired device list error
- Pair one devie, then turn off BT then reboot the phone
  and enter Bluetooth settings screen and turn on BT.
  The last paired device will not be displayed in paired list.
- After onResume() is called, the list is shown.

- The reason is that mDevicePreferenceMap is not empty. The paired
  devices are cached when BT is off and then skipped when BT is
  turned on and updateContent() is called again.
- Make the mDevicePreferenceMap clear when updateContent() is called
  and adapter state is BluetoothAdapter.STATE_ON.

Change-Id: Ia745e02bcb4e21a54ccc8477a4dfbad1fa5aed17
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-25 11:42:38 -07:00
The Android Automerger
de6b3cdddd merge in ics-release history after reset to master 2011-08-25 06:34:51 -07:00
Narayan Kamath
380c93476b Call setLanguage( ) on the TTS engine before the sample.
This makes the sample play faster, and results in a reliable
return value from getLanguage().

bug:5207139
Change-Id: Ic6ca4a2f4aed299d35c320ecc3f327579c66471b
2011-08-24 15:39:36 -07:00
jhtop.kim
d66b61908d Bluetooth : fix for unnecessary device-scan starting
- When trying to pair with any device, if bond state changes
  device scan will be started automatically.

- add some flag to check proper scan time and to prevent unnecessary device scanning.

Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>

Change-Id: I4977ec122105f33cdd25a4f5c9fed59dda916379
2011-08-24 15:31:40 -07:00
Irfan Sheriff
3d05e3c2be Update WifiP2pManager API use
Bug: 5002384
Change-Id: I6fb3564482061783429b433105ae5f2fa1cfafcc
2011-08-24 14:19:29 -07:00
Irfan Sheriff
a796598ff9 Merge "Fixing Wifi strings and pref ordering per ui" 2011-08-24 13:33:13 -07:00
Narayan Kamath
e681a91d3e Merge "Call setLanguage( ) on the TTS engine before the sample." 2011-08-24 12:46:59 -07:00
Narayan Kamath
8c3663bbd7 Call setLanguage( ) on the TTS engine before the sample.
This makes the sample play faster, and results in a reliable
return value from getLanguage().

bug:5207139
Change-Id: Ic6ca4a2f4aed299d35c320ecc3f327579c66471b
2011-08-24 20:33:01 +01:00
Isaac Levy
5070e45a87 Fixing Wifi strings and pref ordering per ui
- also no longer disabling wifi_watchdog toggle when radio is off.

Change-Id: Ic52249afd619028fe2765f434ee166f3d36e14fd
2011-08-24 11:37:39 -07:00
Svetoslav Ganov
b9b935d7cb Merge "Updated Accessibility tutorial strings." 2011-08-24 11:36:09 -07:00
The Android Automerger
f4834a0774 merge in ics-release history after reset to master 2011-08-24 06:34:30 -07:00
Narayan Kamath
fdc53383a9 Merge "Implement the new TTS settings UI." 2011-08-24 02:24:29 -07:00
Jaikumar Ganesh
ba69d3bd7d DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
Bug: 5203970
Change-Id: Ic0604174c0ac9b40685e883f37e1a54070ee0463
2011-08-23 15:11:35 -07:00
Gilles Debunne
1a84334644 Merge "Bug 5038721: battery info links to new location setting for GPS management." 2011-08-23 14:58:59 -07:00
Gilles Debunne
8a0062fd91 Merge "Bug 5050590: wrong title for lock screen" 2011-08-23 13:21:42 -07:00
Irfan Sheriff
9284d48a8a Merge "Autojoin new unsecured networks without dialog" 2011-08-23 13:02:35 -07:00
Isaac Levy
22d441acdb Autojoin new unsecured networks without dialog
Unsaved, open wifi networks will connect on single click
without opening the connect dialog box

Change-Id: I71da155aa8b711309f0ed7eca4bd22a254db28c5
2011-08-23 12:28:44 -07:00
Gilles Debunne
6465054995 Bug 5050590: wrong title for lock screen
Change-Id: Iba170a25ac56db4140ab91f4fd583c0f676b02b0
2011-08-23 11:01:41 -07:00
Narayan Kamath
0cfbb0f10a Implement the new TTS settings UI.
bug:5149036

Change-Id: I81a9786d20be3e9bf87550d6a0cc04191409600c
2011-08-23 18:10:01 +01:00
The Android Automerger
86f274d9ad merge in ics-release history after reset to master 2011-08-23 06:34:45 -07:00
Gilles Debunne
c9575c489b Bug 5038721: battery info links to new location setting for GPS management.
Change-Id: I7063e0b93b6ef9f94cd783ce57206e302126bd9a
2011-08-22 18:02:42 -07:00
Gilles Debunne
778e5240ee Merge "Bug 5161247: More... is aligned with other main menu entries" 2011-08-22 17:39:21 -07:00
Gilles Debunne
81aa9508d8 Merge "Bug 5078738: some options moved to overflow menu" 2011-08-22 17:39:07 -07:00