Commit Graph

2956 Commits

Author SHA1 Message Date
Eric Fischer
1f4c9d674f am cf79e144: Merge "Update large screen translations." into honeycomb
* commit 'cf79e1441160612a8dc5b0917605506e7502ba02':
  Update large screen translations.
2011-01-14 12:59:25 -08:00
Eric Fischer
cf79e14411 Merge "Update large screen translations." into honeycomb 2011-01-14 12:56:21 -08:00
Eric Fischer
9e948f1d08 Update large screen translations.
Change-Id: I4d696b869b35c55db6ba27b6e328c7ced79b4c06
2011-01-14 11:02:51 -08:00
Irfan Sheriff
dee5b26892 Add feedback dialogs for WPS
Upon failure or an existing WPS session,
a dialog message is conveyed to the user

Bug: 3316078
Change-Id: Ibcf27e21058970f8f1667061c7654948c690d48e
2011-01-14 09:43:13 -08:00
Tadashi G. Takaoka
1a64c387aa am ec0be8ce: Merge "Add CHAR LIMIT to string resources" into honeycomb
* commit 'ec0be8ce2e70041f6133cbe68afcfd561eb4a30d':
  Add CHAR LIMIT to string resources
2011-01-14 02:15:34 -08:00
Tadashi G. Takaoka
ec0be8ce2e Merge "Add CHAR LIMIT to string resources" into honeycomb 2011-01-14 02:14:10 -08:00
Tadashi G. Takaoka
bf73f4fb72 Add CHAR LIMIT to string resources
Bug: 3196818
Change-Id: I3e4dc22ba7dfb2bd9f49f4086572b0b39400d3cd
2011-01-14 18:33:42 +09:00
Chia-chi Yeh
8e36fe6625 am e5b5f6eb: Merge "Fix PhysicalKeyboardSettings by merging it into InputMethodConfig." into honeycomb
* commit 'e5b5f6ebe0c27942319c87065fe047f1e05f3bb8':
  Fix PhysicalKeyboardSettings by merging it into InputMethodConfig.
2011-01-14 01:22:43 -08:00
Chia-chi Yeh
e5b5f6ebe0 Merge "Fix PhysicalKeyboardSettings by merging it into InputMethodConfig." into honeycomb 2011-01-14 01:21:12 -08:00
Chia-chi Yeh
71966ce931 Fix PhysicalKeyboardSettings by merging it into InputMethodConfig.
Change-Id: I00deeda813f438f9eb2b7932e3b4d273be2e1ab8
2011-01-14 17:12:01 +08:00
Chung-yih Wang
a256b7c3b4 Fix the re-entrance of VpnSetting issue.
bug:3292801
Change-Id: I77c57d789754f175ce9e43ad77ff2edb711c2316
2011-01-14 16:53:36 +08:00
Chia-chi Yeh
6de7c4afb0 Remove unused layouts.
Change-Id: I0a84da25a6f3e1256bbc0769a66fbc8abf0db120
2011-01-14 14:52:04 +08:00
Jason parks
e46eea9eda am 6f8fb436: Add a setting to enable encryption.
* commit '6f8fb436178d12d11d6ab59671168f0603bdbdcb':
  Add a setting to enable encryption.
2011-01-13 15:42:47 -08:00
Jason parks
6f8fb43617 Add a setting to enable encryption.
This isn't final and it will wipe your device.

Change-Id: I7fecded92a745844435878d0409d620bfa571472
2011-01-13 17:39:20 -06:00
Jake Hamby
d962abdb23 am 4b78f9bb: Merge "Close scan screen when pairing and remove device when unpairing." into honeycomb
* commit '4b78f9bb9b2c4dac2ae4ac063daddb975011313b':
  Close scan screen when pairing and remove device when unpairing.
2011-01-13 13:27:42 -08:00
Jake Hamby
4b78f9bb9b Merge "Close scan screen when pairing and remove device when unpairing." into honeycomb 2011-01-13 13:25:04 -08:00
Fabrice Di Meglio
6945694f14 am d4f337dc: Merge "Fix bug #2987804 (Provide a better UI for selecting the Backup account)" into honeycomb
* commit 'd4f337dcdff1720679cd2b8ae077bdd1604e7b00':
  Fix bug #2987804 (Provide a better UI for selecting the Backup account)
2011-01-13 11:06:39 -08:00
Eric Fischer
a6ef3abf19 am 2a752056: Merge "Import revised translations." into honeycomb
* commit '2a7520567058444bd1e22b601eae3f92b9929455':
  Import revised translations.
2011-01-13 11:03:08 -08:00
Fabrice Di Meglio
d4f337dcdf Merge "Fix bug #2987804 (Provide a better UI for selecting the Backup account)" into honeycomb 2011-01-13 11:01:15 -08:00
Eric Fischer
2a75205670 Merge "Import revised translations." into honeycomb 2011-01-13 10:58:08 -08:00
Jason parks
7da4169dbd am b734f6ab: Merge "Move the CryptKeeper to Settings." into honeycomb
* commit 'b734f6abc46dcdc56f49b10e7c166c003acd2805':
  Move the CryptKeeper to Settings.
2011-01-13 07:45:03 -08:00
Jason parks
b734f6abc4 Merge "Move the CryptKeeper to Settings." into honeycomb 2011-01-13 07:42:16 -08:00
Tadashi G. Takaoka
cb2e2a57e9 am 9aa50e93: Add CHAR LIMIT to input method string resources
* commit '9aa50e93f92509f122e6d07975f9939199b1d368':
  Add CHAR LIMIT to input method string resources
2011-01-13 01:16:37 -08:00
Jake Hamby
2748fc24cf Close scan screen when pairing and remove device when unpairing.
Close the scan screen after successful pairing, and remove a
device from the list of paired devices after unpairing.

As part of the fix, BluetoothSettings was refactored into a parent
class, DeviceListPreferenceFragment, and three subclasses for each
variant type: BluetoothSettings, BluetoothFindNearby, and
DevicePickerFragment, replacing the checks against mScreenType with
custom logic in the child classes.

Bug: 3325848
Change-Id: If64fddc3ba5b4f1136451491c7d5a1139b696e47
2011-01-12 20:33:27 -08:00
Tadashi G. Takaoka
9aa50e93f9 Add CHAR LIMIT to input method string resources
Bug: 3329495
Bug: 3174702
Change-Id: I2b87166a08d911e76e4b660b0933396c14817b20
2011-01-13 11:42:29 +09:00
Eric Fischer
45d893c523 Import revised translations.
Change-Id: I989beece90deec6abb2542697d06caf88ae2f4a9
2011-01-12 17:05:49 -08:00
Joe Onorato
96987f1863 am 11a17eea: Merge "Get rid of the silent mode pref on xlarge." into honeycomb
* commit '11a17eead7632df9b64c45b6cfabb780be7645c7':
  Get rid of the silent mode pref on xlarge.
2011-01-12 15:38:45 -08:00
Joe Onorato
11a17eead7 Merge "Get rid of the silent mode pref on xlarge." into honeycomb 2011-01-12 15:36:40 -08:00
Joe Onorato
057f181f37 Get rid of the silent mode pref on xlarge.
Bug: 3344695
Change-Id: I55ccfd2b22ca4aa407646de54a8dd1dfe637c9bd
2011-01-12 15:35:47 -08:00
Daisuke Miyakawa
abeead4e96 am 480d315c: Merge "Set appropriate margin to dividers in SetupWizard" into honeycomb
* commit '480d315c8e5a2c98fafe60fc2229c8376bc64d60':
  Set appropriate margin to dividers in SetupWizard
2011-01-12 15:32:34 -08:00
Daisuke Miyakawa
480d315c8e Merge "Set appropriate margin to dividers in SetupWizard" into honeycomb 2011-01-12 15:30:25 -08:00
Daisuke Miyakawa
a33ba8eb45 Set appropriate margin to dividers in SetupWizard
Bug: 3346105
Change-Id: I4a8367d54d2c62257618ad9e8415bcd1c3419802
2011-01-12 15:25:20 -08:00
Amith Yamasani
89ec55c9b6 am dad6577f: Merge "Remove popup indicator for dialog style preferences." into honeycomb
* commit 'dad6577fdd694482cb9ea4469cafed9d17b06635':
  Remove popup indicator for dialog style preferences.
2011-01-12 15:03:00 -08:00
Amith Yamasani
dad6577fdd Merge "Remove popup indicator for dialog style preferences." into honeycomb 2011-01-12 14:44:01 -08:00
Amith Yamasani
be6fab0d6d Remove popup indicator for dialog style preferences.
Bug: 3341160

This is for some custom settings that needed dialog style indicators.

Change-Id: Ied9d88c890e764bc0ae50e0299daff50a6b432aa
2011-01-12 14:18:58 -08:00
Jason parks
8fd5bc9e6f Move the CryptKeeper to Settings.
Change-Id: I59e46366e1911ae7fd37f07719f1e7ba0825733c
2011-01-12 16:04:51 -06:00
Fabrice Di Meglio
70bc797a92 Fix bug #2987804 (Provide a better UI for selecting the Backup account)
- make the "Backup account" toggle follow the state of "Back up my data"
- reset Backup account in preferences if needed

Change-Id: Ifdffb9d268a062f6f5ec617bca82699cc46e2b3a
2011-01-12 13:37:40 -08:00
Daisuke Miyakawa
5b9aec9963 am 4f0cd58e: Merge "Show password field when authentication failed." into honeycomb
* commit '4f0cd58e86c173672099f02f94b8a4a3bead574d':
  Show password field when authentication failed.
2011-01-12 11:04:19 -08:00
Daisuke Miyakawa
4f0cd58e86 Merge "Show password field when authentication failed." into honeycomb 2011-01-12 11:02:04 -08:00
Daisuke Miyakawa
cde3083fb5 Show password field when authentication failed.
- add onAuthenticationFailure() method to prepare
  appropriate UIs.
- set "edit" boolean to true so that users can modify
  password when re-seleting a network.
- keep mStatusText shown for simplicity. It has been hidden
  during "editing" phase, but we don't need to do that any more
- modify Connect button handling so that the button
  hides/appears at appropriate time
- manage visibility state of some fields so that
  we can "reset" the status when authentication failed
- show keyboard again when password field re-appears

Bug: 3330109
Change-Id: I1cdf0573280ab46882117e21501a43a447e50b40
2011-01-12 09:59:43 -08:00
Amith Yamasani
78e088a66e am eaf3d4c9: Merge "Remove extra button bar." into honeycomb
* commit 'eaf3d4c95dd442bf5b53db5a467afbd4456be6e4':
  Remove extra button bar.
2011-01-12 09:15:44 -08:00
Amith Yamasani
eaf3d4c95d Merge "Remove extra button bar." into honeycomb 2011-01-12 09:14:27 -08:00
Amith Yamasani
9e3a4700b6 Remove extra button bar.
Bug: 3058024

Change-Id: Ib3c2620869729f8916178ea0c0e899635b470a8f
2011-01-12 09:12:20 -08:00
satok
f6f52a9aa2 am e43bc7ee: Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb
* commit 'e43bc7ee22a633a1ba257f5d2201e1884710b350':
  Automatically turn on "Use system language" when no subtypes become selected Bug:  3327257
2011-01-12 01:20:20 -08:00
satok
e43bc7ee22 Merge "Automatically turn on "Use system language" when no subtypes become selected Bug: 3327257" into honeycomb 2011-01-12 01:18:06 -08:00
Jake Hamby
015506acdc am 55b7d279: Only show "Allow incoming file transfer" option if device supports OPP
* commit '55b7d27936f39c2d6e609c15b1086e9698dbbcfd':
  Only show "Allow incoming file transfer" option if device supports OPP
2011-01-11 20:06:07 -08:00
Jake Hamby
55b7d27936 Only show "Allow incoming file transfer" option if device supports OPP
In the Bluetooth profiles settings screen for a device, the "Allow
incoming file transfer" item should only be shown if the device
supports the Object Push Profile.

Bug: 3297633
Change-Id: I4bbe66ef901feef9dd8a3916fb9827120c1fdfc0
2011-01-11 19:27:17 -08:00
Jake Hamby
f3e37b4c78 am 055c20e5: Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb
* commit '055c20e5760e20dec7661df6deb6cd7fd426103a':
  Allow multiple simultaneous connections for BT input devices.
2011-01-11 18:47:02 -08:00
Jake Hamby
055c20e576 Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb 2011-01-11 18:44:57 -08:00
Eric Fischer
5d59d048eb am 77057e28: Merge "Update large-screen translations." into honeycomb
* commit '77057e282b575a77ee9a4cf8e1a63bc510b0fd2f':
  Update large-screen translations.
2011-01-11 17:43:17 -08:00