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
Eric Fischer
77057e282b
Merge "Update large-screen translations." into honeycomb
2011-01-11 17:39:47 -08:00
Irfan Sheriff
5fd911351d
am 282ef24a
: Merge "Change wifi sleep policy" into honeycomb
...
* commit '282ef24a3aa3ecf14cf68892406daba0858b6fa4':
Change wifi sleep policy
2011-01-11 17:28:41 -08:00
Irfan Sheriff
282ef24a3a
Merge "Change wifi sleep policy" into honeycomb
2011-01-11 17:26:41 -08:00
Roy West
16115c2207
am 89b32ab6
: First part of fix to bug3094381 typos.
...
* commit '89b32ab65d4d9a3d13a0dd16dd26b68f5baeb2bd':
First part of fix to bug3094381 typos.
2011-01-11 17:21:24 -08:00
Roy West
89b32ab65d
First part of fix to bug3094381 typos.
...
Change-Id: Ie2ef07473ae88c023aa9158d12b73dc833043767
2011-01-11 17:17:46 -08:00
Eric Fischer
a793c57291
Update large-screen translations.
...
Change-Id: I618d7e146195a9ce2c5a1f7fc5656b174fd9fcef
2011-01-11 17:01:53 -08:00
Roy West
d1d4b26894
am 7d47f2f9
: Fix bug 3342149, edit lock screen settings text.
...
* commit '7d47f2f9bad77d472b49b88a1c927d07694fff12':
Fix bug 3342149, edit lock screen settings text.
2011-01-11 15:43:40 -08:00
Irfan Sheriff
7f9413911d
Change wifi sleep policy
...
Keep wifi sleep policy as never when charged as long as
user has not changed the settings
Bug: 3038345
Change-Id: I37548984698dd3dd407785544d7b418439ed95d0
2011-01-11 15:39:16 -08:00
Roy West
7d47f2f9ba
Fix bug 3342149, edit lock screen settings text.
...
Change-Id: Ic6691b5ebce1c074143dbe49b0486f693e4236f6
2011-01-11 15:36:29 -08:00
Jeff Brown
6a7250b1e9
am 8c1524d3
: Merge "Disable quicklaunch settings preference." into honeycomb
...
* commit '8c1524d37adf46a0738b51dbf8c7a1c895761b1f':
Disable quicklaunch settings preference.
2011-01-11 15:22:35 -08:00
Jeff Brown
8c1524d37a
Merge "Disable quicklaunch settings preference." into honeycomb
2011-01-11 15:09:05 -08:00
Amith Yamasani
76ea0aa746
am c35b1a23
: Fix build breakage. Order of product="" is important.
...
* commit 'c35b1a23596ca9d9afc241008cc621927fffe43c':
Fix build breakage. Order of product="" is important.
2011-01-11 14:23:03 -08:00