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
b37b2ab2a5
am 1a64c387
: am ec0be8ce
: Merge "Add CHAR LIMIT to string resources" into honeycomb
...
* commit '1a64c387aa7a2e3cba232ebdb606e7da5ef10b34':
Add CHAR LIMIT to string resources
2011-01-14 02:17:35 -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
472385b656
am 8e36fe66
: am e5b5f6eb
: Merge "Fix PhysicalKeyboardSettings by merging it into InputMethodConfig." into honeycomb
...
* commit '8e36fe6625c8660eeb475f209d9688e5ba5d40be':
Fix PhysicalKeyboardSettings by merging it into InputMethodConfig.
2011-01-14 01:24:40 -08: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
3b1424c615
am e46eea9e
: am 6f8fb436
: Add a setting to enable encryption.
...
* commit 'e46eea9edabfba9f310dae2bdaa9aedc551cb1a8':
Add a setting to enable encryption.
2011-01-13 15:44:33 -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
b366f53620
am d962abdb
: am 4b78f9bb
: Merge "Close scan screen when pairing and remove device when unpairing." into honeycomb
...
* commit 'd962abdb236194212bd62e0e13918ecc462db210':
Close scan screen when pairing and remove device when unpairing.
2011-01-13 13:30:42 -08: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
cf5831a7a9
am 6945694f
: am d4f337dc
: Merge "Fix bug #2987804 (Provide a better UI for selecting the Backup account)" into honeycomb
...
* commit '6945694f1428ed69783ee9e8438be176ba37d75d':
Fix bug #2987804 (Provide a better UI for selecting the Backup account)
2011-01-13 11:15:35 -08:00
Eric Fischer
a1ad1fa68c
am a6ef3abf
: am 2a752056
: Merge "Import revised translations." into honeycomb
...
* commit 'a6ef3abf192f5dd6879fe27e218c329311179889':
Import revised translations.
2011-01-13 11:14:54 -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
b0e3d7b487
am 7da4169d
: am b734f6ab
: Merge "Move the CryptKeeper to Settings." into honeycomb
...
* commit '7da4169dbd3940cc2afeed42205d01503cf172a5':
Move the CryptKeeper to Settings.
2011-01-13 07:47:44 -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
9ce5b74f2b
am cb2e2a57
: am 9aa50e93
: Add CHAR LIMIT to input method string resources
...
* commit 'cb2e2a57e9bfbd6fc973cdfd6b931d44deb06dd5':
Add CHAR LIMIT to input method string resources
2011-01-13 01:18:30 -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
3368da4295
am 96987f18
: am 11a17eea
: Merge "Get rid of the silent mode pref on xlarge." into honeycomb
...
* commit '96987f18638bdfc616471a3eb61c5102de515924':
Get rid of the silent mode pref on xlarge.
2011-01-12 15:40:46 -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
d47080145c
am abeead4e
: am 480d315c
: Merge "Set appropriate margin to dividers in SetupWizard" into honeycomb
...
* commit 'abeead4e963a9ec9d4bc9bc7e43cffae452409e0':
Set appropriate margin to dividers in SetupWizard
2011-01-12 15:35:24 -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
34aee7798b
am 89ec55c9
: am dad6577f
: Merge "Remove popup indicator for dialog style preferences." into honeycomb
...
* commit '89ec55c9b6b388b1daf877cd9c93a692f3bdb42c':
Remove popup indicator for dialog style preferences.
2011-01-12 15:07:21 -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
0b481bc06a
am 5b9aec99
: am 4f0cd58e
: Merge "Show password field when authentication failed." into honeycomb
...
* commit '5b9aec99634a5fe4aebacd552d838f8490ff742b':
Show password field when authentication failed.
2011-01-12 11:06:09 -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