Commit Graph

2778 Commits

Author SHA1 Message Date
Jaikumar Ganesh
9f45909322 Merge "Add ability to connect to only headset profile." 2010-12-13 13:43:00 -08:00
Nick Pelly
e537b0eb99 am 934c1b9f: am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit '934c1b9f4b475112e635989fb3d1a9d191a9c9e7':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)
2010-12-13 12:30:40 -08:00
Chung-yih Wang
844c54d11e Fix the retry the vpn connection issue.
Fix the issue of vpn connection retry if back button is pressed
and the profile state is still in connecting.

bug: 3278489
Change-Id: I8b51fdd65b2fdd8cbe4fb43afd916f1966b77b67
2010-12-13 17:34:35 +08:00
Jaikumar Ganesh
498d12bac0 Add ability to connect to only headset profile.
Fix some SDP records issues.

Change-Id: I42816527b1ae0749b4b59b7947f1acb9d2e6f001
2010-12-10 17:51:52 -08:00
Svetoslav Ganov
eab1186a74 Merge "3244931 ANR while in settings attempting to enable Accessibility->Talkabout (IKXEVEREST-1847)" 2010-12-10 17:28:26 -08:00
Svetoslav Ganov
749ba65227 3244931 ANR while in settings attempting to enable Accessibility->Talkabout (IKXEVEREST-1847)
Change-Id: Ifea9324671d0e80a417f4b2fe6dbbe981f8b0679
2010-12-10 17:25:56 -08:00
Nick Pelly
934c1b9f4b am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit 'c1286804cc839ec7006d6e9651c73ec7b3180157':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)
2010-12-10 17:22:30 -08:00
Nick Pelly
c1286804cc Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread 2010-12-10 17:18:54 -08:00
Amith Yamasani
1813c3558c Merge "Move Voice input/output settings to Language & keyboard" 2010-12-10 14:25:14 -08:00
Amith Yamasani
b44161f3ed Move Voice input/output settings to Language & keyboard
Bug: 3267042
Change-Id: I127a2e9d11fb70283812e68979bdde3976e32cf9
2010-12-10 13:20:52 -08:00
Eric Fischer
7553ebea45 Merge "Import revised translations." 2010-12-10 10:57:28 -08:00
Eric Fischer
96021a30fc am 5721cb1d: (-s ours) am 99d2471d: Import revised translations. DO NOT MERGE
* commit '5721cb1d528b097bd2f95dc3cf5cdcb6fec00a8e':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:06:14 -08:00
Eric Fischer
5721cb1d52 am 99d2471d: Import revised translations. DO NOT MERGE
* commit '99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:03:51 -08:00
Jean-Baptiste Queru
c8e6d03480 am 9b9c61f6: am 2a7c5425: reconcile with open-source gingerbread
* commit '9b9c61f6154cfb39c280837698da5834714cab90':
2010-12-10 08:54:09 -08:00
Jean-Baptiste Queru
9b9c61f615 am 2a7c5425: reconcile with open-source gingerbread
* commit '2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
2010-12-10 08:49:47 -08:00
Mike Lockwood
b8f9ab6792 Rename android.hardware.Usb to UsbManager
Change-Id: Id0c0659c29190609bf9ccf4acb56b9402157f41a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 22:35:37 -08:00
Nick Pelly
267419ff8b Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
2010-12-09 19:39:58 -08:00
Eric Fischer
99d2471d8d Import revised translations. DO NOT MERGE
Bug 3272618

Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
2010-12-09 16:57:40 -08:00
Jake Hamby
c090feb64f Implement BT settings functionality for new UI.
- Removed context menu logic for long press (no longer used).
- Converted device picker to run in its own Activity, using a dialog
  theme on large screen devices and full-screen on phones.
- Removed unused resources.
- Add device to "Paired devices" list when pairing is initiated by the
  remote device.
- Return to Bluetooth settings pane after successfully pairing a new
  device from the "Find nearby device" pane.
- Add support for renaming devices (TODO: persist the custom name and
  update the "bread crumb" in the action bar to the new device name).
- Add support for incoming file transfer and auto connect checkboxes
  in DeviceProfilesSettings.
- Show available and connected device profiles as icons instead of
  summary text. Available but disconnected profiles are drawn in gray.
- Fixed bluetooth_notif_message to include the device name as a parameter
  instead of appending the name to the end of the localized string.
- Changed some fields from private to package scope for more efficient
  access from inner classes.

Bug: 3137982

Change-Id: Ic2d6ee5be60c9c5b3f3a8a58846d58efedfa5c93
2010-12-09 16:32:41 -08:00
Eric Fischer
ada96a72af Import revised translations.
Change-Id: I58f1a7d3da4c09ad3e00a94bc5353393b99f7d6d
2010-12-09 16:08:56 -08:00
Jeff Brown
97c01af22b Merge "Show quick launch settings always." 2010-12-09 15:02:18 -08:00
Christopher Tate
aba39c0987 Merge "Add backup configuration action to Privacy settings" 2010-12-09 13:07:05 -08:00
Christopher Tate
df6a7e55cc Add backup configuration action to Privacy settings
Settings now queries the backup manager for a configuration Intent and
text descriptive of the state of the currently-active transport.  These
are used by a new Intent PreferenceScreen within the backup section of
the Privacy settings UI.

When touched, the Configure item launches the Intent supplied by the
transport; when no such Intent is available, the item is disabled.  The
summary text describing the current backup state is also supplied by
the transport.

Bug: 2753632
Change-Id: I3d8fb3d4b08a2b6fa8d3ad8f9e02a66430948423
2010-12-09 12:58:34 -08:00
Jean-Baptiste Queru
e095e3b816 am bd73c736: (-s ours) am 1acfef82: merge from gingerbread
* commit 'bd73c73666e906bca888fb3d206a1b5a583e8447':
  Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-09 10:48:44 -08:00
Jean-Baptiste Queru
bd73c73666 am 1acfef82: merge from gingerbread
* commit '1acfef82bd464fdbd3765321a051e59728b4d72b':
  Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-09 10:45:31 -08:00
Jean-Baptiste Queru
2a7c542594 reconcile with open-source gingerbread
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
2010-12-09 10:18:44 -08:00
Andy Stadler
5cc0e4152b Allow Device Admins to refresh (re-request) activation
* ACTION_ADD_DEVICE_ADMIN now works on already-added admins

Bug: 3253179
Change-Id: I2090339c1fb61295e728bc61ca977ff6028a68dd
2010-12-09 09:22:06 -08:00
Jean-Baptiste Queru
1acfef82bd merge from gingerbread
Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
2010-12-09 09:11:15 -08:00
Jake Hamby
c681e939dd Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
2010-12-09 07:50:04 -08:00
Amith Yamasani
72aa19d1a5 Keep the settings title as "Settings" even if launching a shortcut.
Handle clicks on Settings icon in top-left.
Also fix a bug where Tethering settings was changing the title.
2010-12-09 06:07:50 -08:00
Jeff Brown
819dff1c18 Show quick launch settings always.
Since external keyboards can be connected, we should always show the
quick launch settings.  Unfortunately they still need to be fragmentized.

Change-Id: I1342ef3892a8b1b465ecc5c1346049f8b1ff73cd
2010-12-08 17:12:11 -08:00
Jim Miller
17e9e19330 Fix 3148496: Initial pass at fragmentizing lockscreen settings.
This converts most of the existing activities to fragments and wraps
them in PreferenceActivities so they can be launched as before
(e.g. by a DevicePolicyManager)

Upload after sync/rebase.

Change-Id: I4f351b75d9fca0498bcb04b4e11ff3b70765a4ba
2010-12-08 16:45:52 -08:00
Amith Yamasani
1c7e49ba67 Beautify WiFi dialog layout for x-large
Bug: 3237631
Change-Id: Ibc70008b345fc3f7213ea2db1e6ec2ddb66a1d53
2010-12-08 11:26:41 -08:00
Svetoslav Ganov
126f5ecf4f removing explicit setting of time/date pciker dialogs
Change-Id: Ic92a3de895735fc019ca506f904d63f23c82ec8f
2010-12-07 13:33:20 -08:00
Freeman Ng
8b441e3252 remove all keepScreenOn flags from setup wizard flow
bug: 3253922

Change-Id: I71ef24dcb19437d0666ea3206f184e511b5f047e
2010-12-07 10:54:11 -08:00
Freeman Ng
18b2ef92ce add char limit to a couple of strings
bug: 3196685

Change-Id: I06d71e68485cde8254bbe7c145949791b19fbaae
2010-12-06 15:50:39 -08:00
Kenny Root
e928e94f31 Merge "Add usage bar chart to storage preferences" 2010-12-06 10:46:54 -08:00
Jake Hamby
d2fc155ed0 am 90b1f193: (-s ours) am b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
* commit '90b1f193ad775a5b6a1d9b5aaa744451ad8ab59e':
  Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-06 10:42:49 -08:00
Kenny Root
511c8cf103 Add usage bar chart to storage preferences
Change-Id: Ic3c118ac9194e226e6384e01c9ea7e150b1d9521
2010-12-06 09:34:12 -08:00
Jake Hamby
90b1f193ad am b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
* commit 'b0fda6f56a0ee3c42cf02813b5fc346382873c4f':
  Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-04 23:45:23 -08:00
Roy West
71ac31906a Change Storage settings entry to just that on all platforms.
Change-Id: I3bf714f67a143a94b922cb25f0ecb27ac2c621ba
2010-12-04 08:50:03 -08:00
Jake Hamby
b0fda6f56a Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
2010-12-03 17:24:21 -08:00
Irfan Sheriff
c1bad6bc68 scan immediately when user indicates so
Bug: 3242989
Change-Id: Ia15d7a61a40b64830a7840b7d31e6b5f96b2ad78
2010-12-03 16:22:16 -08:00
Irfan Sheriff
afc2aacf00 Use new config change broadcasts
Bug: 3237735
Change-Id: I29e2807f76d54354bf501b2e7655f49386e6bf95
2010-12-03 14:15:05 -08:00
Amith Yamasani
564e68aece Fix crash when removing account.
Bug: 3248351
2010-12-03 12:26:20 -08:00
Eric Fischer
68b975513a Rename Indonesian and Hebrew translations to match Locale.java conventions
Change-Id: Id3eaf43c69acdff39966ce6b4af4d51ebf14c999
2010-12-02 14:12:25 -08:00
Jim Miller
4b296497ea Fix 3201870: Minor layout tweaks to match pixel perfect.
Change-Id: I3ac587ec2dea43cdf2bd4357a48f75e9b41f440a
2010-12-01 18:01:34 -08:00
Eric Fischer
455a93fa5c Merge "Import revised translations." 2010-12-01 17:00:51 -08:00
Irfan Sheriff
892d74cbcd am ea04ee75: (-s ours) am fa04d89f: avoid view creation on orientation change
* commit 'ea04ee755975e285250f5f2548404b3ff70075d5':
  avoid view creation on orientation change
2010-12-01 16:30:31 -08:00
Irfan Sheriff
ea04ee7559 am fa04d89f: avoid view creation on orientation change
* commit 'fa04d89fd8dd8674375de7a10ca755056b88b811':
  avoid view creation on orientation change
2010-12-01 15:53:32 -08:00