Commit Graph

3462 Commits

Author SHA1 Message Date
Jim Miller
264f36f8db am 7d8afd76: Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb
* commit '7d8afd76f851f4d2d25c1780ab8ed42ee10ab18e':
  Fix 3298889: Show continue button on PIN and password screens
2011-01-11 13:53:21 -08:00
Jake Hamby
815df29359 am 31a07143: Merge "Don\'t throw exception on unexpected BT device addition." into honeycomb
* commit '31a071432ee036c828b8df67a6d33f438d7efe5f':
  Don't throw exception on unexpected BT device addition.
2011-01-11 13:51:26 -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
Jake Hamby
31a071432e Merge "Don't throw exception on unexpected BT device addition." into honeycomb 2011-01-11 13:49:17 -08:00
Jake Hamby
c6e1b293a7 Don't throw exception on unexpected BT device addition.
Fix for reported bug where settings app crashes while trying to share
a picture. Bug report showed IllegalStateException thrown with message
"Got onDeviceAdded, but cachedDevice already exists." Changed code to
print an error message to the log and ignore the unexpected event,
rather than throwing an uncaught exception that crashes the app.

Bug: 2192884
Change-Id: I016be6a1616b317b2289768d18ae9f069a49445e
2011-01-11 13:27:50 -08:00
Amith Yamasani
a3ea288ed4 am bd3468a5: am dc4926db: Merge "Remove phone number status conditionally for devices without voice." into honeycomb
* commit 'bd3468a5ba4edabcc2bd49ccdae956f189e93875':
  Remove phone number status conditionally for devices without voice.
2011-01-11 13:22:40 -08:00
Amith Yamasani
bd3468a5ba am dc4926db: Merge "Remove phone number status conditionally for devices without voice." into honeycomb
* commit 'dc4926db23fb039a024211dafd86939e9f441901':
  Remove phone number status conditionally for devices without voice.
2011-01-11 13:21:02 -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
Daisuke Miyakawa
21b5b362ac am b37f1101: am 844f323e: Modify layout for wifi and datetime setup
* commit 'b37f1101a6684155e24f85c70cabd84f66ad0120':
  Modify layout for wifi and datetime setup
2011-01-11 12:34:33 -08:00
Daisuke Miyakawa
b37f1101a6 am 844f323e: Modify layout for wifi and datetime setup
* commit '844f323ee5fc7200b201eb23d3a37e9aa9a10cec':
  Modify layout for wifi and datetime setup
2011-01-11 12:31:13 -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
d096e7f830 am 32ac9196: am c961f0ac: Modify layout for Wi-Fi Setup
* commit '32ac91969b08672a618c16c108635dd2c59c31d7':
  Modify layout for Wi-Fi Setup
2011-01-11 09:21:06 -08:00
Daisuke Miyakawa
32ac91969b am c961f0ac: Modify layout for Wi-Fi Setup
* commit 'c961f0ac0b95ae563b03bd724a1f76223b0a5c85':
  Modify layout for Wi-Fi Setup
2011-01-11 09:18:53 -08:00
Daisuke Miyakawa
c961f0ac0b Modify layout for Wi-Fi Setup
Bug: 3330109
Change-Id: I09a3965cb150d1004ef03d6bc3170ad79526c47f
2011-01-11 09:14:26 -08:00
satok
74a5414b3c Automatically turn on "Use system language" when no subtypes become selected
Bug:  3327257

Change-Id: I99a8c2769957963db99fa72be6cc76cc9cd97abf
2011-01-11 23:19:01 +09: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
7b9259ec8f am fb1d6abb: am c9787070: Fix 3333490,3250193: Update LockScreen settings
* commit 'fb1d6abbed40860d419b5b4ca50f8f9bc237cee4':
  Fix 3333490,3250193: Update LockScreen settings
2011-01-10 19:26:08 -08:00
Jim Miller
fb1d6abbed am c9787070: Fix 3333490,3250193: Update LockScreen settings
* commit 'c9787070bab332b80676b745a44dd8ee4d72073d':
  Fix 3333490,3250193: Update LockScreen settings
2011-01-10 19:24:32 -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
Joe Onorato
084c7cbf7f am 2cc0b514: am 9bcc6913: Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
* commit '2cc0b5143e82d57bea0871cbfda28489f726e6ed':
  Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
2011-01-10 18:05:47 -08:00
Joe Onorato
2cc0b5143e am 9bcc6913: Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
* commit '9bcc69131db19842c2712304fb5699418dae415a':
  Partially revert "Conditionally remove Dock settings shortcut and Power control widget."
2011-01-10 17:26:18 -08:00
Jake Hamby
a0d39a39c2 Allow multiple simultaneous connections for BT input devices.
Move responsibility for disconnecting devices before connecting a new
profile from CachedBluetoothDevice to LocalBluetoothProfileManager.

The ProfileManager subclasses of LocalBluetoothProfileManager will
handle disconnecting the previously connected device, if necessary,
as part of connect(). The HID profile allows multiple simultaneous
connected devices, while the other supported profiles do not.

Bug: 3333975
Change-Id: Id51b26e64f7c3ee7d54af3a03ca82a669f305b52
2011-01-10 17:02:26 -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
910a6d31e8 am b51d38b8: am 7edb5131: Fix capitalization in \'Google Search\'.
* commit 'b51d38b857a0457c01615c5209aafc2c888686df':
  Fix capitalization in 'Google Search'.
2011-01-10 08:41:00 -08:00
Mathew Inwood
b51d38b857 am 7edb5131: Fix capitalization in \'Google Search\'.
* commit '7edb5131810cf193d9f55517ed839c3b6c41159e':
  Fix capitalization in 'Google Search'.
2011-01-10 08:39:08 -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
c0a279705a am 20689fc0: am 9391b954: Fix 3333434: Rename "Display" to "Screen" and make dynamic
* commit '20689fc059d52f4097d885468c72415d38f5383f':
  Fix 3333434: Rename "Display" to "Screen" and make dynamic
2011-01-09 14:32:04 -08:00
Jim Miller
20689fc059 am 9391b954: Fix 3333434: Rename "Display" to "Screen" and make dynamic
* commit '9391b9545f9845eae15713357bc4081853451f4a':
  Fix 3333434: Rename "Display" to "Screen" and make dynamic
2011-01-09 14:30:22 -08: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
Jim Miller
a37a970749 am e61b5219: (-s ours) am 7da8cae4: Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]
* commit 'e61b52191c591ea9fa8c68caf171fa294bc3cbca':
  Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]
2011-01-09 14:07:04 -08:00
Jim Miller
e61b52191c am 7da8cae4: Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]
* commit '7da8cae44b622518fbffd6d265f291c39e9fc722':
  Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]
2011-01-09 14:05:25 -08:00
Jim Miller
7da8cae44b Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]
Manual merge of Change-Id: I3c53d1864e521f4245b94d39664266891a728615

Change-Id: I59eedd81af226949ac0df10390ae0642e1812c5a
2011-01-09 13:57:53 -08:00
Amith Yamasani
e53cb16d3b am 6d41da5f: am 580c80f8: Conditionally remove Dock settings shortcut and Power control widget.
* commit '6d41da5ff5730287e93fbb0758743f3980648f31':
  Conditionally remove Dock settings shortcut and Power control widget.
2011-01-09 12:10:18 -08:00
Amith Yamasani
6d41da5ff5 am 580c80f8: Conditionally remove Dock settings shortcut and Power control widget.
* commit '580c80f853747741ae74fbb6f670315077586208':
  Conditionally remove Dock settings shortcut and Power control widget.
2011-01-09 12:08:41 -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
Eric Fischer
13bfcff7fd am 18f2cc8f: am 40bcf565: (-s ours) am 6418d373: Import translations for additional languages.
* commit '18f2cc8f21ad8294e111aea178d9c7f41a151ecd':
  Import translations for additional languages.
2011-01-08 13:15:07 -08:00
Eric Fischer
18f2cc8f21 am 40bcf565: (-s ours) am 6418d373: Import translations for additional languages.
* commit '40bcf565d3613dd8e7530aafa3ece68a47e19a10':
  Import translations for additional languages.
2011-01-08 05:32:35 -08:00
Fabrice Di Meglio
efdb39ca4f am ce9f77bb: Fix for bug #3325868 (add accounts should not use the settings activity as part of its flow)
* commit 'ce9f77bb558434b9daa40304d3eb8a7201865ac8':
  Fix for bug #3325868 (add accounts should not use the settings activity as part of its flow)
2011-01-08 04:40:11 -08:00
Fabrice Di Meglio
ce9f77bb55 Fix for bug #3325868 (add accounts should not use the settings activity as part of its flow)
- suppress non needed AccountSyncSettingsInAddAccount class

Change-Id: I27ba9ea2d45a5e2c9ec1d2ed6033f6d68e100a3f
2011-01-07 17:47:59 -08:00
Vasu Nori
d0da8c3838 am b1a234ef: Merge "bug:3276501 set CHAR_LIMIT for i18n purposes" into honeycomb
* commit 'b1a234ef46dffa625acc37dac3d612a52149ba2d':
  bug:3276501 set CHAR_LIMIT for i18n purposes
2011-01-07 16:12:57 -08:00
Amith Yamasani
fcbd5ac1a6 am 9587121f: Merge "Use a resizable dialog for wifi configuration." into honeycomb
* commit '9587121fe56484105fa7b4776beafc772f86f7cf':
  Use a resizable dialog for wifi configuration.
2011-01-07 16:12:54 -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
Amith Yamasani
7ab5bdcd40 am 167f72ba: Merge "Don\'t add wifi entries twice, when returning from another activity." into honeycomb
* commit '167f72ba7c2a1e0797253766d4447a24a7d244c2':
  Don't add wifi entries twice, when returning from another activity.
2011-01-07 15:30:08 -08:00
Amith Yamasani
167f72ba7c Merge "Don't add wifi entries twice, when returning from another activity." into honeycomb 2011-01-07 15:24:47 -08:00
Vasu Nori
450bcb32ea bug:3276501 set CHAR_LIMIT for i18n purposes
Change-Id: I0e230f3f935d3a657bff5e2092ff20ca8d0f8e95
2011-01-07 14:48:46 -08:00
Jim Miller
8c74072e9c Fix 3281395: Fix duplicate title in LockScreen Settings.
Change-Id: I3c53d1864e521f4245b94d39664266891a728615
2011-01-07 13:37:30 -08:00