Commit Graph

2698 Commits

Author SHA1 Message Date
Irfan Sheriff
ee4c4500d5 Merge "fix wifi checkbox status update" 2010-12-16 15:52:12 -08:00
Irfan Sheriff
cb52d4b4ab fix wifi checkbox status update
Bug: 3277268
Change-Id: Idfabf1be41c5e54cd93695de1bb06164760d7fad
2010-12-16 15:10:26 -08:00
Jake Hamby
22c4b39e06 Change BT pairing UI PIN dialog string for clarity.
When pairing with a Bluetooth keyboard, the user may not realize
that the PIN should be entered on the keyboard as well as the device.
Added "You may need to enter the same PIN on the Bluetooth device."
to pairing dialog string. Also, remove unused Bluetooth device info
debug strings.

Bug: 3270429
Change-Id: I6d7fa70cf7b12c1feafb8347f356c568b10ae646
2010-12-16 13:54:57 -08:00
Daisuke Miyakawa
dadf1e53cb Show "not configurable" screen in EAP
Bug: 3175016
Change-Id: If67c0cbf41adee205c8b3eec410e39bc29c2f04d
2010-12-16 10:58:49 -08:00
Daisuke Miyakawa
0333f74b9c Use different text in unsecured network.
We don't show any config UI when network is unsecured, while
Previously we've shown "Enter network configuration" anyway.

Also stop showing network status on StatusText (above
AccessPoint). New network status often appears and instructions
are removed unexpectedly.

Bug: 3175016
Change-Id: I3aa288930a8643e178f7c3897b326b7e00964361
2010-12-16 10:45:23 -08:00
Amith Yamasani
eb99f2f3f4 Fixes a regression in launching certain settings activities.
Some undocumented settings and class names are being used by NotificationManagerService.
Added compatibility activities to handle them.

Bug: 3258668
2010-12-15 15:46:12 -08:00
Fabrice Di Meglio
744b8af2fb Merge "Fix bug #3248308 (On account set up, turn on sync for all apps by default; delay sync until after user selects Finish)" 2010-12-15 14:44:00 -08:00
Jim Miller
e201a54c53 Merge "Fix 3148496: Update LockScreen layouts on large device" 2010-12-15 14:37:33 -08:00
Fabrice Di Meglio
31ffa0439d Fix bug #3248308 (On account set up, turn on sync for all apps by default; delay sync until after user selects Finish)
- reuse code by making AccountSyncSettings work in two modes: either use SyncManager or not

Change-Id: I29fc6820aa41ad4689745ed97d38248474033e7e
2010-12-15 14:31:50 -08:00
Mike Lockwood
ac0ed0a0be Merge "Revert: Add checkbox to enable PTP USB mode." 2010-12-15 14:26:46 -08:00
Mike Lockwood
bbef4f9a7d Revert: Add checkbox to enable PTP USB mode.
Change-Id: I7c00c3c3c5da66a31a68fe0767302d2cdda526a1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-15 14:23:04 -08:00
Jim Miller
2e28acedc6 Fix 3148496: Update LockScreen layouts on large device
This updates the layouts to conform to the latest UX spec on
large devices and fixes a bug where the IME shown for PIN
selection was the QWERTY keyboard.

Change-Id: Ib9f0b1631f11c8eff6898bfff9447d3dad75cc42
2010-12-15 14:15:01 -08:00
Daisuke Miyakawa
da40cc28d9 Remove skip button from datetime settings
Also force landscape mode in XLarge screen.

Bug: 3285153
Change-Id: I9f4a0de6a36d0be2b5f80b734a4910f4bb154905
2010-12-15 11:56:35 -08:00
Amith Yamasani
73e70721b0 Merge "Fix an NPE for monkey stability." 2010-12-15 09:58:15 -08:00
Amith Yamasani
c948b16e73 Fix an NPE for monkey stability.
Bug: 3283484
2010-12-15 09:43:44 -08:00
Eric Fischer
59f309cf4a Merge "Import revised translations." 2010-12-14 17:36:44 -08:00
Amith Yamasani
c9fdfa8a72 Handle fragment breadcrumbs for deep-linked settings launches.
This adds meta-data to the manifest for specifying the parent fragment and enabling a link
in the breadcrumbs to navigate "up" a level even if the parent is not in the back-stack.

Bug: 3236568

Fix a monkey issue in VpnSettings.
2010-12-14 14:58:06 -08:00
Eric Fischer
7ea34ac8c8 Import revised translations.
Change-Id: Ic03653ba9e447830ec3d4b3ae5d9c7b4472d6170
2010-12-14 13:59:18 -08:00
Jake Hamby
3f0f998aa7 Remove Bluetooth tethering settings screen.
Remove obsolete Bluetooth tethering settings screen. BT tethering can
be turned on and off, but the connection must be initiated by the
remote device. For reverse tethering, there will be a checkbox for
that profile in the regular Bluetooth device settings screen.

Bug: 3283928
Change-Id: Ic25139f8862b305feb0381e61c24b7783fad2366
2010-12-14 13:40:10 -08:00
Irfan Sheriff
cdbc80afb2 Use WpsConfiguration for new API
Change-Id: I4c1544178bcb29e751db56edb781faf9145cdf86
2010-12-13 16:00:41 -08:00
Nick Pelly
b8be6da887 Fix master build. WirelessSettings is a fragment in master.
Change-Id: I9ad1104605558859d90dd1ecc083e9ef35bf3fa0
2010-12-13 14:02:07 -08:00
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