Commit Graph

1104 Commits

Author SHA1 Message Date
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
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
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
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
4b78f9bb9b Merge "Close scan screen when pairing and remove device when unpairing." into honeycomb 2011-01-13 13:25:04 -08:00
Eric Fischer
2a75205670 Merge "Import revised translations." into honeycomb 2011-01-13 10:58:08 -08:00
Jason parks
b734f6abc4 Merge "Move the CryptKeeper to Settings." into honeycomb 2011-01-13 07:42:16 -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
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
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
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
Eric Fischer
77057e282b Merge "Update large-screen translations." into honeycomb 2011-01-11 17:39:47 -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
7d47f2f9ba Fix bug 3342149, edit lock screen settings text.
Change-Id: Ic6691b5ebce1c074143dbe49b0486f693e4236f6
2011-01-11 15:36:29 -08:00
Jeff Brown
8c1524d37a Merge "Disable quicklaunch settings preference." into honeycomb 2011-01-11 15:09:05 -08:00
Amith Yamasani
c35b1a2359 Fix build breakage. Order of product="" is important.
Change-Id: I3232966b90879118e287de77450d736daa58a169
2011-01-11 14:18:44 -08:00
Jim Miller
7d8afd76f8 Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb 2011-01-11 13:50:40 -08:00
Amith Yamasani
dc4926db23 Merge "Remove phone number status conditionally for devices without voice." into honeycomb 2011-01-11 13:19:24 -08:00
Amith Yamasani
ffe813c380 Remove phone number status conditionally for devices without voice.
Bug: 3041861

Change-Id: I36fb6c584c24b995da0ac4e3b41d860f3a6f5396
2011-01-11 12:18:28 -08:00
Daisuke Miyakawa
844f323ee5 Modify layout for wifi and datetime setup
Change-Id: I8410a98246d81606ab728cfe4e9c700dd5ef2c7e
2011-01-11 11:20:45 -08:00
Daisuke Miyakawa
c961f0ac0b Modify layout for Wi-Fi Setup
Bug: 3330109
Change-Id: I09a3965cb150d1004ef03d6bc3170ad79526c47f
2011-01-11 09:14:26 -08:00
Jim Miller
d75905991c Fix 3298889: Show continue button on PIN and password screens
This fixes the above bug by allowing the PIN and password
screens to shrink to reveal the continue/cancel buttons
when the IME is shown.

This also fixes a minor resource bug where the title was
showing "confirm your password/pin" instead of "choose your password/pin".

Change-Id: I610c6018085e0c4ef1b6dc384566d06d1211f8ea
2011-01-10 19:57:29 -08:00
Jim Miller
c9787070ba Fix 3333490,3250193: Update LockScreen settings
This updates LockScreen to conform to the latest UI design.

Change-Id: Ie88a26db7912ddb4331804e347189cc084c481f4
2011-01-10 18:26:20 -08:00
Jeff Brown
52e5891560 Disable quicklaunch settings preference.
Bug: 3290450
Change-Id: Ib1a8926d7b18b8821395b06c9cdc7763e774c847
2011-01-10 14:03:06 -08:00
Joe Onorato
9bcc69131d Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
This reverts commit 580c80f853.

So it turns out we won't have the ability to control the enabled flag from
Configuration changes because the dependency is actually in the package manager.
I'm reverting this change and going to do another one that just turns them
off for all configurations, because honeycomb is just for tablets.

Change-Id: I16b7b1e2d59a3a917448ce0361e3ce0fdd062a86
2011-01-10 13:35:44 -08:00
Mathew Inwood
7edb513181 Fix capitalization in 'Google Search'.
Bug: 3093036
Change-Id: Iddd5de0ba2b40f2088cce2c5a30a0a9cafaf6aaf
2011-01-10 16:33:31 +00:00
Jim Miller
9391b9545f Fix 3333434: Rename "Display" to "Screen" and make dynamic
This changes the setting "Display" to "Screen" and updates
the timeout summary to reflect the current setting.

Change-Id: Id8209d445f65a0908ae8093a8f5f7f951f333053
2011-01-09 14:26:54 -08:00
Amith Yamasani
580c80f853 Conditionally remove Dock settings shortcut and Power control widget.
Bug: 3258028
Bug: 3248740

Change-Id: Id37787cc9562cde13048e8dfba957599219d94b5
2011-01-09 12:03:45 -08:00
Vasu Nori
b1a234ef46 Merge "bug:3276501 set CHAR_LIMIT for i18n purposes" into honeycomb 2011-01-07 15:41:11 -08:00
Amith Yamasani
9587121fe5 Merge "Use a resizable dialog for wifi configuration." into honeycomb 2011-01-07 15:35:31 -08:00
Amith Yamasani
25b69ebccc Use a resizable dialog for wifi configuration.
Bug: 3175152

Use a custom theme that allows the dialog to resize.

Change-Id: I004b91c58d0d1810df50f9bdee9430698f51f8ab
2011-01-07 15:31:35 -08:00
Vasu Nori
450bcb32ea bug:3276501 set CHAR_LIMIT for i18n purposes
Change-Id: I0e230f3f935d3a657bff5e2092ff20ca8d0f8e95
2011-01-07 14:48:46 -08:00
Eric Fischer
9765a444cd Merge "Import some unabbreviated translations for large screens." into honeycomb 2011-01-07 12:58:37 -08:00
Eric Fischer
b3ebcd8eeb Import some unabbreviated translations for large screens.
Change-Id: I87158f97c12d779d749c8c05c6b2436bb349bacc
2011-01-06 17:47:49 -08:00
Jaikumar Ganesh
586fa0264c Merge "Add new pairing dialog for keyboard pairings." into honeycomb 2011-01-06 14:26:57 -08:00
Jaikumar Ganesh
da23ae88d1 Add new pairing dialog for keyboard pairings.
Change-Id: I672a3d874a7876fca6bd38091444dc9c5fb3a2f1
2011-01-06 13:38:09 -08:00
Daisuke Miyakawa
8630cde72b Remove unnecessary codes around WifiSettings.
Bug: 3321110
Change-Id: Iaac35a507b8e46e2d4702f0e5cda7b515a57db67
2011-01-06 13:27:36 -08:00
Joe Onorato
6c1eb53e26 Add the CHAR LIMIT annotation
Bug: 3196825
Change-Id: I64e8b757162000c69dfb61261112185dab651ed0
2011-01-04 18:52:17 -08:00
Eric Fischer
4625bb2af2 Merge changes Ia9338cf2,I5ef641b5
* changes:
  Import revised translations.
  Remove unreferenced layout that used two deleted strings.
2011-01-04 14:48:25 -08:00
Daisuke Miyakawa
5915d5d3c5 Add missing id.
If29bb34fce04eab5adc9b5180b70dbfd718cc709 added
proxy_settings_title, which should be available in Setup Wizard
flow.

Bug: 3321533
Change-Id: I4c2590dc728dde573502b91e5ef5b7bd8323bc97
2011-01-04 11:44:09 -08:00