Jason parks
f947ca5157
am a13e9c87
: Merge "Encrypt inplace settings." into honeycomb
...
* commit 'a13e9c877ce4928df0095f47b6117cc4b5403fb2':
Encrypt inplace settings.
2011-01-20 17:07:36 -08:00
Daisuke Miyakawa
596c5e1adc
am 39281d01
: Merge "Use new backgrounds in wifi setup for xl" into honeycomb
...
* commit '39281d0163aa410391a128d1d2c8194c88e732fb':
Use new backgrounds in wifi setup for xl
2011-01-20 17:07:03 -08:00
Daisuke Miyakawa
ca2870f373
Rename title for Date Time setup
...
Bug: 3374552
Change-Id: I37a4ac3f7fb1a9f0cf9624aba2a69dd85e9743ac
2011-01-20 16:31:40 -08:00
Jason parks
43775c7f9b
Merge "More work on the CryptKeeper." into honeycomb
2011-01-20 15:58:02 -08:00
Jason parks
a13e9c877c
Merge "Encrypt inplace settings." into honeycomb
2011-01-20 15:50:55 -08:00
Daisuke Miyakawa
39281d0163
Merge "Use new backgrounds in wifi setup for xl" into honeycomb
2011-01-20 14:59:39 -08:00
Daisuke Miyakawa
8f533a6232
Use new backgrounds in wifi setup for xl
...
Bug: 3373467
Change-Id: Iccc9a4c36dc46a67e395c81a642646b8199be606
2011-01-20 12:28:47 -08:00
Roy West
b15cdd3876
am 02cfbe9d
: am e97bc56d
: Tidy up Internal storage screen text.
...
* commit '02cfbe9db561ada9e594359a8568b30ee5b7f00c':
Tidy up Internal storage screen text.
2011-01-20 10:12:29 -08:00
Roy West
02cfbe9db5
am e97bc56d
: Tidy up Internal storage screen text.
...
* commit 'e97bc56db1b84b997467726ca9ecf78193eb03d4':
Tidy up Internal storage screen text.
2011-01-20 10:10:17 -08:00
Roy West
e97bc56db1
Tidy up Internal storage screen text.
...
Change-Id: Ia1b3b79a6df1756c2a4ff9440463771cfa308c13
2011-01-20 10:06:33 -08:00
Chia-chi Yeh
c76a630548
am 2dbfa510
: am 9003862e
: Merge "Extract credential storage dialogs to a new activity." into honeycomb
...
* commit '2dbfa510691637c1f773fa0550de50d84bc0e7f0':
Extract credential storage dialogs to a new activity.
2011-01-20 04:30:12 -08:00
Chia-chi Yeh
2dbfa51069
am 9003862e
: Merge "Extract credential storage dialogs to a new activity." into honeycomb
...
* commit '9003862e2548d513bf6d10ee853761ce9a3586d9':
Extract credential storage dialogs to a new activity.
2011-01-20 04:28:16 -08:00
Chia-chi Yeh
9003862e25
Merge "Extract credential storage dialogs to a new activity." into honeycomb
2011-01-20 04:26:10 -08:00
Chia-chi Yeh
91d65a20af
Extract credential storage dialogs to a new activity.
...
Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.
Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d
2011-01-20 19:45:04 +08:00
Chung-yih Wang
162f765052
am 279d20b8
: am a4491eaf
: Fix the vpnsetting NPE crash.
...
* commit '279d20b8e3814c4a9314bbd84df1f323e4df9c51':
Fix the vpnsetting NPE crash.
2011-01-20 02:42:13 -08:00
Chung-yih Wang
279d20b8e3
am a4491eaf
: Fix the vpnsetting NPE crash.
...
* commit 'a4491eafd45c460b0317e7962e24d47e3c4206fb':
Fix the vpnsetting NPE crash.
2011-01-20 02:40:42 -08:00
Chung-yih Wang
a4491eafd4
Fix the vpnsetting NPE crash.
...
The bug is triggered by rotating the screen after restoring the
vpn setting which was showing the connect dialog from the recent tasks.
Change-Id: I2562b208fa28f9b6ffa8acba1ab14e0f83b3a0c6
2011-01-20 18:31:26 +08:00
Eric Fischer
53f11f67e5
am d4147929
: am a934c39d
: Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb
...
* commit 'd4147929cb3f068f96f2a3f6a3054c91063c2dbb':
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.
2011-01-19 15:42:04 -08:00
Jake Hamby
424d914256
am ade2349e
: am a76d5390
: Merge "Display correct HID icon for pointing and misc. devices" into honeycomb
...
* commit 'ade2349e75ac86e203511442b7e9636e11c5eec4':
Display correct HID icon for pointing and misc. devices
2011-01-19 15:40:10 -08:00
Eric Fischer
d4147929cb
am a934c39d
: Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb
...
* commit 'a934c39d19c0a906065193fe913a318a68d5cc1e':
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.
2011-01-19 15:40:02 -08:00
Jake Hamby
ade2349e75
am a76d5390
: Merge "Display correct HID icon for pointing and misc. devices" into honeycomb
...
* commit 'a76d53909913324b3e39d3c5edfd7e0c41abbbb0':
Display correct HID icon for pointing and misc. devices
2011-01-19 15:38:03 -08:00
Eric Fischer
a934c39d19
Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb
2011-01-19 15:36:56 -08:00
Jake Hamby
cde015b3d4
Display correct HID icon for pointing and misc. devices
...
Added placeholder icons and code for non-keyboard HID devices.
ic_bt_pointing_hid.png - pointing device
ic_bt_misc_hid.png - gamepad, remote control, card reader, etc.
Bug: 3137982
Change-Id: Iac7a53a6fbafa9c6ed794a29aa330da314d580d8
2011-01-19 15:24:39 -08:00
Eric Fischer
de6eb79e15
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.
...
Bug 2605239
Change-Id: I196aadd21281d18e228a7bf7e947a2b0fa7c6d05
2011-01-19 15:16:20 -08:00
Jake Hamby
d3d81651fd
am cf35b7c3
: am 2fdd006b
: Add preference to show the list of files received via Bluetooth.
...
* commit 'cf35b7c3620ac83231f8af0c62f458f6b1ea23ae':
Add preference to show the list of files received via Bluetooth.
2011-01-19 13:30:49 -08:00
Jake Hamby
cf35b7c362
am 2fdd006b
: Add preference to show the list of files received via Bluetooth.
...
* commit '2fdd006b1a625cd20d94861a8c7210f93a283b77':
Add preference to show the list of files received via Bluetooth.
2011-01-19 13:29:24 -08:00
Jake Hamby
9bbb5a2fe9
am d33cc31a
: am 8140d9c9
: Add icons for Bluetooth HID and PAN profiles.
...
* commit 'd33cc31a61157dabcedc3aae6180d8f534117d3b':
Add icons for Bluetooth HID and PAN profiles.
2011-01-19 13:27:51 -08:00
Jake Hamby
d33cc31a61
am 8140d9c9
: Add icons for Bluetooth HID and PAN profiles.
...
* commit '8140d9c9166990236e9b15cdefc96d348ba69a53':
Add icons for Bluetooth HID and PAN profiles.
2011-01-19 13:25:22 -08:00
Jake Hamby
2fdd006b1a
Add preference to show the list of files received via Bluetooth.
...
Add a preference item to show a dialog window containing the list
of files received via Bluetooth. This replaces the "live folder"
view that was available in Gingerbread and earlier.
Bug: 3167219
Change-Id: I703266dba47c9ef8c52e5569aba0f812a9511bb5
2011-01-19 13:24:57 -08:00
Jake Hamby
8140d9c916
Add icons for Bluetooth HID and PAN profiles.
...
Add icon resources for Bluetooth keyboard/mouse (HID profile)
and reverse tethering (PAN profile).
Bug: 3137982
Change-Id: Id6c4a9f2b4bee2fdf43626592e32070b49e49d73
2011-01-19 12:25:46 -08:00
Daisuke Miyakawa
0ef7379c61
am 1a2dc008
: am 0692dffa
: Fix layout in DateTime picker
...
* commit '1a2dc008ac859ed76b5fcd123871a5a0cbc34e25':
Fix layout in DateTime picker
2011-01-18 22:03:37 -08:00
Daisuke Miyakawa
9248cbe59d
am 94ae6dc5
: am a30013fa
: UI fix for wifi setup in xl
...
* commit '94ae6dc516a7d73aa4e0ed6e518dbecf657f222f':
UI fix for wifi setup in xl
2011-01-18 22:03:16 -08:00
Daisuke Miyakawa
c7e2ff7d69
am 2d341782
: am b213d30d
: Merge "Polish layout and UI for wifi setup" into honeycomb
...
* commit '2d34178259b0d135b9b815d4689ed8d3af4c74e6':
Polish layout and UI for wifi setup
2011-01-18 21:57:51 -08:00
Kenny Root
cd88535c6e
am 62e873ed
: am 9f1f6ca2
: Merge "Don\'t show separate option for erasing USB storage" into honeycomb
...
* commit '62e873edca85c582edccd05e8c8e255ae4d2a371':
Don't show separate option for erasing USB storage
2011-01-18 21:57:08 -08:00
Daisuke Miyakawa
1a2dc008ac
am 0692dffa
: Fix layout in DateTime picker
...
* commit '0692dffa8eacc0784e98083711e759b9e6b79d30':
Fix layout in DateTime picker
2011-01-18 21:03:44 -08:00
Daisuke Miyakawa
0692dffa8e
Fix layout in DateTime picker
...
Bug: 3347865
Change-Id: I9c425186515df387ac7951ff85ccf3d4d6732d08
2011-01-18 21:01:38 -08:00
Daisuke Miyakawa
94ae6dc516
am a30013fa
: UI fix for wifi setup in xl
...
* commit 'a30013fad40bcbe02d87863edae488b75c73190d':
UI fix for wifi setup in xl
2011-01-18 20:31:41 -08:00
Daisuke Miyakawa
a30013fad4
UI fix for wifi setup in xl
...
- Show "connecting" and "connected" text
- Modify layout for "Add network"
Bug: 3347865
Change-Id: I9c9b33b9033e7fb4f885717f00507c1360400725
2011-01-18 20:29:47 -08:00
Daisuke Miyakawa
2d34178259
am b213d30d
: Merge "Polish layout and UI for wifi setup" into honeycomb
...
* commit 'b213d30d2c33a6475d7824f3fc5349e707cb9769':
Polish layout and UI for wifi setup
2011-01-18 18:36:22 -08:00
Daisuke Miyakawa
b213d30d2c
Merge "Polish layout and UI for wifi setup" into honeycomb
2011-01-18 16:26:18 -08:00
Daisuke Miyakawa
ee5576ce06
Polish layout and UI for wifi setup
...
Bug: 3347865
Change-Id: I529fc2f5e11388b34b66617aee64b7facd3708e0
2011-01-18 16:26:03 -08:00
Kenny Root
62e873edca
am 9f1f6ca2
: Merge "Don\'t show separate option for erasing USB storage" into honeycomb
...
* commit '9f1f6ca27a7f0cb0bdb70806e4c4b9ed3ceece79':
Don't show separate option for erasing USB storage
2011-01-18 15:40:12 -08:00
Kenny Root
9f1f6ca27a
Merge "Don't show separate option for erasing USB storage" into honeycomb
2011-01-18 15:38:14 -08:00
Eric Fischer
c1c4aecd45
am b4bb7b47
: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b4bb7b470b033e654b277d77ce121e37f67deb0f':
Import revised translations. DO NOT MERGE
2011-01-18 15:17:27 -08:00
Kenny Root
3785e390d2
Don't show separate option for erasing USB storage
...
On devices with emulated USB storage or SD card, factory reset will wipe
all data from that area. Given that, it doesn't make sense to show a
different option for wiping USB storage.
Bug: 3242568
Change-Id: I257bdde06141f14381c8c09ce6a42c18d7080efd
2011-01-18 15:14:32 -08:00
Eric Fischer
fed18746ec
Import revised translations. DO NOT MERGE
...
Change-Id: I876d6ce88a61ed0e4ce8e5d649fa12072ebe26bb
2011-01-18 15:07:02 -08:00
Jason parks
ec5a45e79c
More work on the CryptKeeper.
...
* There is now a 30 seconds delay after 10 failed password attempts.
* The device is factory reset after 30 failed password attempts.
* Implemented the progress UI for inplace encryption.
Change-Id: Ie830b03f9c84a117ee3048086275d6049907fa3c
2011-01-18 15:28:53 -06:00
Daisuke Miyakawa
fb9ecde417
am 18d6fe1a
: Widen default password field length in Wifi setup
...
* commit '18d6fe1a3dddb55999801c34cd624f5f65f32d96':
Widen default password field length in Wifi setup
2011-01-18 10:14:07 -08:00
Daisuke Miyakawa
18d6fe1a3d
Widen default password field length in Wifi setup
...
Current password field doesn't show 26 characters which is
usual in some wifi devices.
Change-Id: Ifaf40f9174346451ae49f5f2ab0368326d7a9906
2011-01-18 10:06:31 -08:00
Amith Yamasani
b50a06a0e1
am 2768ae05
: am f7fd4ca8
: Merge "Disable change PIN when PIN is inactive"
...
* commit '2768ae05bc675e08ab84499d6d0ef83231ff2b04':
Disable change PIN when PIN is inactive
2011-01-18 09:14:14 -08:00