OSDN Git Service

android-x86/packages-apps-Settings.git
13 years agoImport translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:39:31 +0000 (10:39 -0800)]
Import translations for additional languages.

Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5

13 years agoMerge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
Nick Pelly [Sat, 11 Dec 2010 01:18:54 +0000 (17:18 -0800)]
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

13 years agoUpdate Settings for new NfcAdapter.getDefaultAdapter(Context)
Nick Pelly [Fri, 10 Dec 2010 03:39:58 +0000 (19:39 -0800)]
Update Settings for new NfcAdapter.getDefaultAdapter(Context)

Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Dec 2010 00:57:40 +0000 (16:57 -0800)]
Import revised translations.  DO NOT MERGE

Bug 3272618

Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e

13 years agoreconcile with open-source gingerbread
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:44 +0000 (10:18 -0800)]
reconcile with open-source gingerbread

Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0

13 years agoReduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)

The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b

13 years agoReduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)

The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.

Bug: 3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6

13 years agoavoid view creation on orientation change
Irfan Sheriff [Wed, 1 Dec 2010 23:05:44 +0000 (15:05 -0800)]
avoid view creation on orientation change

Bug: 3238075
Change-Id: Ia245e701b9663a1a8eb0457b8a181a7899e8d6c5

13 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 30 Nov 2010 00:21:55 +0000 (16:21 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f

14 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 11 Nov 2010 23:43:19 +0000 (15:43 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

14 years agoMerge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread
Dianne Hackborn [Thu, 11 Nov 2010 01:58:58 +0000 (17:58 -0800)]
Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into gingerbread

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 9 Nov 2010 20:19:25 +0000 (12:19 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b

14 years agoFix issue #3177284: Account for wake lock power usage on Crespo
Dianne Hackborn [Tue, 9 Nov 2010 03:05:00 +0000 (19:05 -0800)]
Fix issue #3177284: Account for wake lock power usage on Crespo

Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964

14 years agoUpdate settings text on success, so we clear out error text after recovery.
Nick Pelly [Thu, 4 Nov 2010 02:56:36 +0000 (21:56 -0500)]
Update settings text on success, so we clear out error text after recovery.

Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
14 years agoFix issue #3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 20:49:20 +0000 (13:49 -0700)]
Fix issue #3146784: ANR in manage applications

See the big comment.

Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 22:46:11 +0000 (15:46 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72

14 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:01:29 +0000 (16:01 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 22 Oct 2010 22:31:13 +0000 (15:31 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e

14 years agoFix issue #3124528: Mange applications is including cache files in storage size
Dianne Hackborn [Fri, 22 Oct 2010 19:18:16 +0000 (12:18 -0700)]
Fix issue #3124528: Mange applications is including cache files in storage size

Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266

14 years agoFix the build. A "--" token is not just text in an XML comment.
Eric Fischer [Fri, 22 Oct 2010 01:15:34 +0000 (18:15 -0700)]
Fix the build.  A "--" token is not just text in an XML comment.

Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380

14 years agoTry to fix bug3119318 without breaking the build this time
Roy West [Fri, 22 Oct 2010 00:18:40 +0000 (17:18 -0700)]
Try to fix bug3119318 without breaking the build this time

Change-Id: Ic89675546f3ab72588ce18fbe7740749da6f870c

14 years agoRevert "Fix bug3119318, missing Mount USB storage strings"
Mathias Agopian [Thu, 21 Oct 2010 23:37:59 +0000 (16:37 -0700)]
Revert "Fix bug3119318, missing Mount USB storage strings"

This reverts commit af06d7a94a69d82ef5f2d8082e75c368f4204afb.

14 years agoFix bug3119318, missing Mount USB storage strings
Roy West [Thu, 21 Oct 2010 22:47:14 +0000 (15:47 -0700)]
Fix bug3119318, missing Mount USB storage strings

Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d

14 years agoMerge "NFC Settings cleanup." into gingerbread
Nick Pelly [Thu, 21 Oct 2010 10:56:18 +0000 (03:56 -0700)]
Merge "NFC Settings cleanup." into gingerbread

14 years agoNFC Settings cleanup.
Nick Pelly [Thu, 21 Oct 2010 01:42:23 +0000 (18:42 -0700)]
NFC Settings cleanup.

NFC service now tracks its own settings. Call the NFC API to determine
state.

Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
14 years agoMerge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into...
Dianne Hackborn [Wed, 20 Oct 2010 23:58:47 +0000 (16:58 -0700)]
Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread

14 years agoFix issue #3114356: Storage visualization in Manage Apps is confusing
Dianne Hackborn [Wed, 20 Oct 2010 23:01:50 +0000 (16:01 -0700)]
Fix issue #3114356: Storage visualization in Manage Apps is confusing

Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached

Change-Id: If3377a965653590e5bc1df25e38764a83e96b820

14 years agoMerge "Fix NFC permission." into gingerbread
Nick Pelly [Wed, 20 Oct 2010 23:44:41 +0000 (16:44 -0700)]
Merge "Fix NFC permission." into gingerbread

14 years agoFix NFC permission.
Nick Pelly [Wed, 20 Oct 2010 23:39:44 +0000 (16:39 -0700)]
Fix NFC permission.

(it's not actually needed right now, hence why nothing was broken).

Change-Id: I52ea0b49a77eca4e3a688d37aa721d3483227553

14 years agoFix issue #3108683: GRH18: Battery usage chart FCs
Dianne Hackborn [Tue, 19 Oct 2010 23:23:53 +0000 (16:23 -0700)]
Fix issue #3108683: GRH18: Battery usage chart FCs

Make array more bigger, and bounds check the thing.

Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a

14 years agoNFC: async enabling/disabling, ala Bluewooth & Wifi.
Brad Fitzpatrick [Mon, 18 Oct 2010 21:04:24 +0000 (14:04 -0700)]
NFC: async enabling/disabling, ala Bluewooth & Wifi.

Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8

14 years agoDel "erase" from new unmount setting subtext
Roy West [Mon, 18 Oct 2010 10:12:57 +0000 (03:12 -0700)]
Del "erase" from new unmount setting subtext

Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3

14 years agoCorrect some typos, impose more consistency.
Roy West [Sun, 17 Oct 2010 16:19:34 +0000 (09:19 -0700)]
Correct some typos, impose more consistency.

Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda

14 years agoImplement issue #3094621 and #3094609 - wipe sd card
Dianne Hackborn [Thu, 14 Oct 2010 18:58:30 +0000 (11:58 -0700)]
Implement issue #3094621 and #3094609 - wipe sd card

3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Implements requested UI changes.  Also some final tweaks to
Manage Applications.

Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89

14 years agoImport revised translations DO NOT MERGE
Kenny Root [Fri, 15 Oct 2010 22:24:57 +0000 (15:24 -0700)]
Import revised translations DO NOT MERGE

Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9

14 years agoMerge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Nick Pelly [Fri, 15 Oct 2010 17:56:05 +0000 (10:56 -0700)]
Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread

14 years agoMake summary appear for both checked and unchecked NFC checkbox in Settings.
Amith Yamasani [Fri, 15 Oct 2010 00:20:59 +0000 (17:20 -0700)]
Make summary appear for both checked and unchecked NFC checkbox in Settings.

And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368

14 years agoChange USB tab to USB storage if it fits
Roy West [Fri, 15 Oct 2010 12:18:04 +0000 (05:18 -0700)]
Change USB tab to USB storage if it fits

Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5

14 years agoUse NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Nick Pelly [Fri, 15 Oct 2010 08:19:43 +0000 (01:19 -0700)]
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.

Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
14 years agoFix a few more cases of USB storage missed at 4am pass...
Roy West [Thu, 14 Oct 2010 22:59:33 +0000 (15:59 -0700)]
Fix a few more cases of USB storage missed at 4am pass...

Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c

14 years agoMerge "Disconnect dock only if its connected." into gingerbread
Jaikumar Ganesh [Thu, 14 Oct 2010 22:30:55 +0000 (15:30 -0700)]
Merge "Disconnect dock only if its connected." into gingerbread

14 years agoDisconnect dock only if its connected.
Jaikumar Ganesh [Thu, 14 Oct 2010 22:01:38 +0000 (15:01 -0700)]
Disconnect dock only if its connected.

Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.

Bug: 3097224

Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08

14 years agoMerge "Import revised translations" into gingerbread
Kenny Root [Thu, 14 Oct 2010 21:16:47 +0000 (14:16 -0700)]
Merge "Import revised translations" into gingerbread

14 years agoImport revised translations
Kenny Root [Thu, 14 Oct 2010 16:46:33 +0000 (09:46 -0700)]
Import revised translations

Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de

14 years agoUpdate storage names to 10-13 decision; add USB erase nugget
Roy West [Thu, 14 Oct 2010 12:07:45 +0000 (05:07 -0700)]
Update storage names to 10-13 decision; add USB erase nugget

Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce

14 years agoBT settings wait for HS service before connect. DO NOT MERGE
Jake Hamby [Tue, 12 Oct 2010 23:12:06 +0000 (16:12 -0700)]
BT settings wait for HS service before connect.  DO NOT MERGE

Bluetooth connections from Settings app can sometimes fail if the
connection to BluetoothHeadsetService isn't ready. Changed code to
delay any headset connect or disconnect attempt when the service isn't
connected until onServiceConnected() is called.

Tested by adding a call to Thread.sleep(5000) before the return
statement in BluetoothHeadsetService.onBind(). This makes it easier to
kill the phone process and then attempt to connect in the settings app
before the service restarts.

Bug: 3048839
Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3

14 years agoMerge "Move NFC setting lower down the Setting's list." into gingerbread
Nick Pelly [Wed, 13 Oct 2010 20:59:00 +0000 (13:59 -0700)]
Merge "Move NFC setting lower down the Setting's list." into gingerbread

14 years agoMove NFC setting lower down the Setting's list.
Nick Pelly [Wed, 13 Oct 2010 19:22:37 +0000 (12:22 -0700)]
Move NFC setting lower down the Setting's list.

Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0

14 years agoMerge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 18:09:35 +0000 (11:09 -0700)]
Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread

14 years agoDO NOT MERGE Add null check before disconnecting a device.
Jaikumar Ganesh [Wed, 13 Oct 2010 17:53:05 +0000 (10:53 -0700)]
DO NOT MERGE Add null check before disconnecting a device.

Bug: 3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159

14 years agoUpdate NFC settings description, and fix polarity.
Nick Pelly [Wed, 13 Oct 2010 04:22:54 +0000 (21:22 -0700)]
Update NFC settings description, and fix polarity.

Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a

14 years agoMerge "Call disconnect / connect without checking the current status" into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 02:04:01 +0000 (19:04 -0700)]
Merge "Call disconnect / connect without checking the current status" into gingerbread

14 years agoMerge "Update settings app for new NFC API." into gingerbread
Nick Pelly [Wed, 13 Oct 2010 01:58:46 +0000 (18:58 -0700)]
Merge "Update settings app for new NFC API." into gingerbread

14 years agoCall disconnect / connect without checking the current status
Jaikumar Ganesh [Tue, 12 Oct 2010 23:14:10 +0000 (16:14 -0700)]
Call disconnect / connect without checking the current status

Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.

Bug: 3076404

Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f

14 years agoUpdate settings app for new NFC API.
Nick Pelly [Tue, 12 Oct 2010 20:07:06 +0000 (13:07 -0700)]
Update settings app for new NFC API.

Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com>
14 years agoMerge "Don't show the sort menu for running process list" into gingerbread
Kenny Root [Tue, 12 Oct 2010 19:25:34 +0000 (12:25 -0700)]
Merge "Don't show the sort menu for running process list" into gingerbread

14 years agoMerge "Hide "System tutorial" option if there's no IME tutorial bug: 3074212" into...
Freeman Ng [Tue, 12 Oct 2010 18:06:46 +0000 (11:06 -0700)]
Merge "Hide "System tutorial" option if there's no IME tutorial bug: 3074212" into gingerbread

14 years agoDon't show the sort menu for running process list
Kenny Root [Tue, 12 Oct 2010 16:42:44 +0000 (09:42 -0700)]
Don't show the sort menu for running process list

You could bring up the menu and sort running processes by size or name
which would display the applications list at the same time the running
process list was being displayed. This happened because the
mApplicationsAdapter is used for the list of apps and is sortable, but
the running process list doesn't use the adapter.

Disable the menu when the running applications list is presented to
prevent this situation where two ListViews are visible.

Bug: 3084901
Change-Id: I5304cf7a1f426269ed4858e649729a35b9344717

14 years agoHide "System tutorial" option if there's no IME tutorial
Freeman Ng [Tue, 12 Oct 2010 01:51:34 +0000 (18:51 -0700)]
Hide "System tutorial" option if there's no IME tutorial
bug: 3074212

Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e

14 years agoWith luck, final take on bug3076083, re back up settting
Roy West [Tue, 12 Oct 2010 00:34:27 +0000 (17:34 -0700)]
With luck, final take on bug3076083, re back up settting

Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb

14 years agoMerge "Fix bug where car dock sometimes doesn't connect." into gingerbread
Jake Hamby [Mon, 11 Oct 2010 20:05:11 +0000 (13:05 -0700)]
Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread

14 years agoImprove password hint visibility
Irfan Sheriff [Mon, 11 Oct 2010 17:26:14 +0000 (10:26 -0700)]
Improve password hint visibility

Bug: 3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab

14 years agoFix bug3076083 re backup setting strings
Roy West [Sat, 9 Oct 2010 16:40:23 +0000 (09:40 -0700)]
Fix bug3076083 re backup setting strings

Change-Id: I01939082d8179d28872a3367eb1691738595cb71

14 years agodo not merge
Roy West [Thu, 7 Oct 2010 22:15:45 +0000 (15:15 -0700)]
do not merge

Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521

14 years agodo not merge
Roy West [Thu, 7 Oct 2010 15:34:41 +0000 (08:34 -0700)]
do not merge

Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6

14 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 7 Oct 2010 00:33:02 +0000 (17:33 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 7 Oct 2010 00:15:09 +0000 (17:15 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3

14 years agoAdd confirmation when stopping system service, as per rwest.
Dianne Hackborn [Wed, 6 Oct 2010 23:46:53 +0000 (16:46 -0700)]
Add confirmation when stopping system service, as per rwest.

Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba

14 years agoFix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidg...
Dianne Hackborn [Wed, 6 Oct 2010 21:28:23 +0000 (14:28 -0700)]
Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider

Make the receiver private.  Also fix to correctly update when sync
status changes.

Change-Id: I35481bf5b473196b00427da4df49aa76f691d38b

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Oct 2010 18:56:08 +0000 (11:56 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f

14 years agoManage apps "on SD card" now shows all apps that can go on SD card.
Dianne Hackborn [Tue, 5 Oct 2010 01:32:59 +0000 (18:32 -0700)]
Manage apps "on SD card" now shows all apps that can go on SD card.

Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca

14 years agoSeparate the Settings activity name into two different strings.
Eric Fischer [Fri, 1 Oct 2010 18:45:47 +0000 (11:45 -0700)]
Separate the Settings activity name into two different strings.

The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.

Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329

14 years agoMerge "Fix android:allowClearUserData." into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 02:03:55 +0000 (19:03 -0700)]
Merge "Fix android:allowClearUserData." into gingerbread

14 years agoFix android:allowClearUserData.
Dianne Hackborn [Fri, 1 Oct 2010 01:49:18 +0000 (18:49 -0700)]
Fix android:allowClearUserData.

Now respect this flag for system apps.

Change-Id: I496b0051a4998cb41b8c07fd0eb85e253de1eb97

14 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 30 Sep 2010 22:48:14 +0000 (15:48 -0700)]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

14 years agoUpdate strings for physical keyboard settings.
Ken Wakasa [Thu, 30 Sep 2010 03:52:52 +0000 (12:52 +0900)]
Update strings for physical keyboard settings.

bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7

14 years agoNew assets for power widget: gps, sync
Gilles Debunne [Wed, 29 Sep 2010 23:02:13 +0000 (16:02 -0700)]
New assets for power widget: gps, sync

Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad

14 years agoFix bug where car dock sometimes doesn't connect.
Jake Hamby [Wed, 29 Sep 2010 22:06:42 +0000 (15:06 -0700)]
Fix bug where car dock sometimes doesn't connect.

Attempt to connect to car/desk dock after pairing completes. This
fixes a bug where we didn't try to connect if we received the UUID
change intent before the bonding state change intent.

Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 29 Sep 2010 21:36:34 +0000 (14:36 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b

14 years agoMerge "New assets (wifi, bluetooth...)" into gingerbread
Gilles Debunne [Wed, 29 Sep 2010 19:18:12 +0000 (12:18 -0700)]
Merge "New assets (wifi, bluetooth...)" into gingerbread

14 years agoNew assets (wifi, bluetooth...)
Gilles Debunne [Wed, 29 Sep 2010 19:10:37 +0000 (12:10 -0700)]
New assets (wifi, bluetooth...)

Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583

14 years agoSplit strings with SD card references into variations.
Eric Fischer [Tue, 28 Sep 2010 23:35:31 +0000 (16:35 -0700)]
Split strings with SD card references into variations.

Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be

14 years agoRevise the Language & keyboard settings layout.
Ken Wakasa [Tue, 28 Sep 2010 10:01:17 +0000 (19:01 +0900)]
Revise the Language & keyboard settings layout.

bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017

14 years agoMerge "Add NFC checkbox to Settings app." into gingerbread
Nick Pelly [Wed, 29 Sep 2010 05:32:51 +0000 (22:32 -0700)]
Merge "Add NFC checkbox to Settings app." into gingerbread

14 years agoAdd NFC checkbox to Settings app.
Nick Pelly [Wed, 22 Sep 2010 17:55:13 +0000 (10:55 -0700)]
Add NFC checkbox to Settings app.

Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Heavily modified to remove dead code.

Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900

14 years agoMerge "Improve the add-device-admin layout." into gingerbread
Chris Palmer [Tue, 28 Sep 2010 17:34:43 +0000 (10:34 -0700)]
Merge "Improve the add-device-admin layout." into gingerbread

14 years agoImprove the add-device-admin layout.
Chris Palmer [Mon, 13 Sep 2010 22:14:55 +0000 (15:14 -0700)]
Improve the add-device-admin layout.

Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.

Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592

14 years agoMerge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to defau...
Winson Chung [Mon, 27 Sep 2010 22:06:47 +0000 (15:06 -0700)]
Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread

14 years agoModifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default...
Winson Chung [Mon, 27 Sep 2010 18:34:10 +0000 (11:34 -0700)]
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab

Change-Id: I5c18b916b09979117e4b746f521a81ca554903b4

14 years agoMerge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:27:55 +0000 (12:27 -0700)]
Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

14 years agoTrim unwanted whitespace from translations. DO NOT MERGE
Eric Fischer [Mon, 27 Sep 2010 19:21:49 +0000 (12:21 -0700)]
Trim unwanted whitespace from translations.  DO NOT MERGE

Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7

14 years agoMerge "Fix the indicators in the button bar. The middle ones were showing the left...
Amith Yamasani [Mon, 27 Sep 2010 18:20:52 +0000 (11:20 -0700)]
Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread

14 years agoFix the indicators in the button bar. The middle ones were showing the left indicator...
Amith Yamasani [Sun, 26 Sep 2010 22:58:00 +0000 (15:58 -0700)]
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.

Earlier refactoring seems to have messed it up. Added a position value to the state trackers.

Bug: 2980926

Change-Id: I31df4b1ae0b835d801d67747154594299498c4cf

14 years agoreconcile froyo-release into gingerbread
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:50 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread

Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b

14 years agoAuto-connect Bluetooth device only when user initiates pairing.
Jake Hamby [Fri, 24 Sep 2010 02:16:28 +0000 (19:16 -0700)]
Auto-connect Bluetooth device only when user initiates pairing.

Fix bug 2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).

Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).

Change-Id: I121105c6eee2658129f6094786754bbc7932d324

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 24 Sep 2010 17:26:20 +0000 (10:26 -0700)]
Import revised translations.  DO NOT MERGE

Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b

14 years agoFix Bluetooth device name max length checking.
Jake Hamby [Thu, 16 Sep 2010 23:55:43 +0000 (16:55 -0700)]
Fix Bluetooth device name max length checking.

The Bluetooth device name has a maximum length of 248 bytes in UTF-8
encoding. The settings app previously limited the Bluetooth device
name entered by the user based on the number of characters, which is
incorrect when the name includes non-ASCII characters.

Created a new Utf8ByteLengthFilter class for BluetoothNamePreference
which counts UTF-8 bytes instead of Unicode characters, along with
unit tests.

We can move Utf8ByteLengthFilter into the framework in the future
if it would be useful elsewhere in the system or for applications.

Change-Id: I9debface09659f09d750f3bfe8ad6ddfd34c75c5

14 years agoRemove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Mon, 20 Sep 2010 11:40:57 +0000 (12:40 +0100)]
Remove Search from the system Settings app DO NOT MERGE

The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

Bug: 3017365

Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d

14 years agoRemove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Mon, 20 Sep 2010 11:40:57 +0000 (12:40 +0100)]
Remove Search from the system Settings app DO NOT MERGE

The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d
to gingerbread.

Bug: 3017365
Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f

14 years agoMerge "Some improvements to the manage apps code:" into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 00:06:58 +0000 (17:06 -0700)]
Merge "Some improvements to the manage apps code:" into gingerbread