OSDN Git Service

android-x86/packages-apps-Settings.git
13 years agoam 1054e489: Merge "Hide "System tutorial" option if there\'s no IME tutorial bug...
Freeman Ng [Tue, 12 Oct 2010 18:23:29 +0000 (11:23 -0700)]
am 1054e489: Merge "Hide "System tutorial" option if there\'s no IME tutorial bug: 3074212" into gingerbread

Merge commit '1054e4890ae50d2550ee822f0680346f48d48c97' into gingerbread-plus-aosp

* commit '1054e4890ae50d2550ee822f0680346f48d48c97':
  Hide "System tutorial" option if there's no IME tutorial

13 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

13 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

13 years agoam 30186392: With luck, final take on bug3076083, re back up settting
Roy West [Tue, 12 Oct 2010 00:39:34 +0000 (17:39 -0700)]
am 30186392: With luck, final take on bug3076083, re back up settting

Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp

* commit '3018639200a3f04d274166e26c98307ab07fc3b9':
  With luck, final take on bug3076083, re back up settting

13 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

13 years agoam 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread
Jake Hamby [Mon, 11 Oct 2010 20:07:09 +0000 (13:07 -0700)]
am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread

Merge commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp

* commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
  Fix bug where car dock sometimes doesn't connect.

13 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

13 years agoam 566b5bb0: Improve password hint visibility
Irfan Sheriff [Mon, 11 Oct 2010 17:30:17 +0000 (10:30 -0700)]
am 566b5bb0: Improve password hint visibility

Merge commit '566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp

* commit '566b5bb0f91224069bbc98ea7042d22c8929aa59':
  Improve password hint visibility

13 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

13 years agoam b84291bb: Merge "Support showing "Cold" battery health."
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:50:41 +0000 (17:50 -0700)]
am b84291bb: Merge "Support showing "Cold" battery health."

Merge commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp

* commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6':
  Support showing "Cold" battery health.

13 years agoMerge "Support showing "Cold" battery health."
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:37:59 +0000 (17:37 -0700)]
Merge "Support showing "Cold" battery health."

13 years agoam effdd53f: Fix bug3076083 re backup setting strings
Roy West [Sat, 9 Oct 2010 17:07:54 +0000 (10:07 -0700)]
am effdd53f: Fix bug3076083 re backup setting strings

Merge commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a' into gingerbread-plus-aosp

* commit 'effdd53ff863d2ff8ffe64065c16b06ba01b3a8a':
  Fix bug3076083 re backup setting strings

13 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

13 years agoam 82d2908b: do not merge
Roy West [Thu, 7 Oct 2010 22:48:18 +0000 (15:48 -0700)]
am 82d2908b: do not merge

Merge commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c' into gingerbread-plus-aosp

* commit '82d2908b2e1fc67f72e40f47fe053efca2bfce6c':
  do not merge

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

Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521

13 years agoam e3b0bda2: do not merge
Roy West [Thu, 7 Oct 2010 21:04:23 +0000 (14:04 -0700)]
am e3b0bda2: do not merge

Merge commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6' into gingerbread-plus-aosp

* commit 'e3b0bda234e2cdcb6349c5c0385aad34c38b1ec6':
  do not merge

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

Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6

13 years agoam d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 7 Oct 2010 14:17:15 +0000 (07:17 -0700)]
am d86f58a9: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'd86f58a93e14f6f187aa25d6714503af177031eb' into gingerbread-plus-aosp

* commit 'd86f58a93e14f6f187aa25d6714503af177031eb':
  Import revised translations.  DO NOT MERGE

13 years agoam b8f9c9cf: Add confirmation when stopping system service, as per rwest.
Dianne Hackborn [Thu, 7 Oct 2010 14:16:40 +0000 (07:16 -0700)]
am b8f9c9cf: Add confirmation when stopping system service, as per rwest.

Merge commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b' into gingerbread-plus-aosp

* commit 'b8f9c9cf7c0343c6c05296bb7af8fdccdc3b7a3b':
  Add confirmation when stopping system service, as per rwest.

13 years agoam 4b21f7cd: Fix issue #3062691: GPS enable bypass via com.android.settings.widget...
Dianne Hackborn [Thu, 7 Oct 2010 14:16:02 +0000 (07:16 -0700)]
am 4b21f7cd: Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider

Merge commit '4b21f7cd9424eeb83838071a4419912ee5d5e41d' into gingerbread-plus-aosp

* commit '4b21f7cd9424eeb83838071a4419912ee5d5e41d':
  Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider

13 years agoam 84c8c175: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 7 Oct 2010 14:14:16 +0000 (07:14 -0700)]
am 84c8c175: Import revised translations.  DO NOT MERGE

Merge commit '84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp

* commit '84c8c175c8ee797f61121211c3ef8638d127cdf6':
  Import revised translations.  DO NOT MERGE

13 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

13 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

13 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

13 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

13 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

13 years agoam 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.
Dianne Hackborn [Tue, 5 Oct 2010 06:04:57 +0000 (23:04 -0700)]
am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.

Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp

* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
  Manage apps "on SD card" now shows all apps that can go on SD card.

13 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

13 years agoam 340c5c42: Separate the Settings activity name into two different strings.
Eric Fischer [Fri, 1 Oct 2010 19:04:08 +0000 (12:04 -0700)]
am 340c5c42: Separate the Settings activity name into two different strings.

Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp

* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
  Separate the Settings activity name into two different strings.

13 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

13 years agoam 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Dianne Hackborn [Fri, 1 Oct 2010 02:14:28 +0000 (19:14 -0700)]
am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread

Merge commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp

* commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2':
  Fix android:allowClearUserData.

13 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

13 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

13 years agoam f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 30 Sep 2010 22:58:20 +0000 (15:58 -0700)]
am f20931bc: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp

* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
  Import revised translations.  DO NOT MERGE

13 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

13 years agoam 2d6c0b0d: Update strings for physical keyboard settings.
Ken Wakasa [Thu, 30 Sep 2010 17:10:29 +0000 (10:10 -0700)]
am 2d6c0b0d: Update strings for physical keyboard settings.

Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp

* commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
  Update strings for physical keyboard settings.

13 years agoam a63b08d9: New assets for power widget: gps, sync
Gilles Debunne [Thu, 30 Sep 2010 17:08:43 +0000 (10:08 -0700)]
am a63b08d9: New assets for power widget: gps, sync

Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp

* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
  New assets for power widget: gps, sync

13 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

13 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

13 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

13 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

13 years agoam 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Gilles Debunne [Wed, 29 Sep 2010 19:20:36 +0000 (12:20 -0700)]
am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread

Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp

* commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4':
  New assets (wifi, bluetooth...)

13 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

13 years agoam 5698a75f: Split strings with SD card references into variations.
Eric Fischer [Wed, 29 Sep 2010 19:17:20 +0000 (12:17 -0700)]
am 5698a75f: Split strings with SD card references into variations.

Merge commit '5698a75f15526a38ee8e0b647d05e4ee358c575a' into gingerbread-plus-aosp

* commit '5698a75f15526a38ee8e0b647d05e4ee358c575a':
  Split strings with SD card references into variations.

13 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

13 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

13 years agoam d2c3f37f: Revise the Language & keyboard settings layout.
Ken Wakasa [Wed, 29 Sep 2010 16:58:01 +0000 (09:58 -0700)]
am d2c3f37f: Revise the Language & keyboard settings layout.

Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.

13 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

13 years agoam 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread
Nick Pelly [Wed, 29 Sep 2010 05:34:42 +0000 (22:34 -0700)]
am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread

Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp

* commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
  Add NFC checkbox to Settings app.

13 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

13 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

13 years agoam 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
Chris Palmer [Tue, 28 Sep 2010 17:44:16 +0000 (10:44 -0700)]
am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread

Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp

* commit '88fdee27e97900173be2b1f4f86c25a7c381969c':
  Improve the add-device-admin layout.

13 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

13 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

13 years agoam 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action...
Winson Chung [Mon, 27 Sep 2010 22:09:08 +0000 (15:09 -0700)]
am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread

Merge commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp

* commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130':
  Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab

13 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

13 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

13 years agoam 54e21852: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into...
Eric Fischer [Mon, 27 Sep 2010 19:33:33 +0000 (12:33 -0700)]
am 54e21852: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp

* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
  Trim unwanted whitespace from translations.  DO NOT MERGE

13 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

13 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

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

Merge commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8' into gingerbread-plus-aosp

* commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8':
  Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.

13 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

13 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

13 years agoam 32d54b19: reconcile froyo-release into gingerbread
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:42:25 +0000 (17:42 -0700)]
am 32d54b19: reconcile froyo-release into gingerbread

Merge commit '32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp

* commit '32d54b19367505547a67c2b717047fdab375db94':
  Remove Search from the system Settings app DO NOT MERGE

13 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

13 years agoam 3f1ba01d: Merge "BT: The Phone doesn\'t "wake up" when trying to pair with it."
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:41:23 +0000 (08:41 -0700)]
am 3f1ba01d: Merge "BT: The Phone doesn\'t "wake up" when trying to pair with it."

Merge commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13' into gingerbread-plus-aosp

* commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13':
  BT: The Phone doesn't "wake up" when trying to pair with it.

13 years agoMerge "BT: The Phone doesn't "wake up" when trying to pair with it."
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:05:46 +0000 (08:05 -0700)]
Merge "BT: The Phone doesn't "wake up" when trying to pair with it."

13 years agoam dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.
Jake Hamby [Sat, 25 Sep 2010 00:16:37 +0000 (17:16 -0700)]
am dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.

Merge commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8' into gingerbread-plus-aosp

* commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8':
  Auto-connect Bluetooth device only when user initiates pairing.

13 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

13 years agoam b2fa8719: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 24 Sep 2010 18:08:52 +0000 (11:08 -0700)]
am b2fa8719: Import revised translations.  DO NOT MERGE

Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp

* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
  Import revised translations.  DO NOT MERGE

13 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

13 years agoam 59091c08: Fix Bluetooth device name max length checking.
Jake Hamby [Wed, 22 Sep 2010 23:26:02 +0000 (16:26 -0700)]
am 59091c08: Fix Bluetooth device name max length checking.

Merge commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336' into gingerbread-plus-aosp

* commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336':
  Fix Bluetooth device name max length checking.

13 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

13 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

13 years agoam 28580b4d: Remove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Tue, 21 Sep 2010 10:05:25 +0000 (03:05 -0700)]
am 28580b4d: Remove Search from the system Settings app DO NOT MERGE

Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp

* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
  Remove Search from the system Settings app DO NOT MERGE

13 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

13 years agoam 3a6bb47d: Merge "Some improvements to the manage apps code:" into gingerbread
Dianne Hackborn [Tue, 21 Sep 2010 00:09:39 +0000 (17:09 -0700)]
am 3a6bb47d: Merge "Some improvements to the manage apps code:" into gingerbread

Merge commit '3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb' into gingerbread-plus-aosp

* commit '3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb':
  Some improvements to the manage apps code:

13 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

13 years agoSome improvements to the manage apps code:
Dianne Hackborn [Mon, 20 Sep 2010 18:40:46 +0000 (11:40 -0700)]
Some improvements to the manage apps code:

- Battery stats now aggregates bluetooth usage.
- Battery stats now uses new history iterator API.
- Battery stats chart is refectored to have the start of a
  common facility for building tick charts.
- Manage apps will now asynchronously wait for the apps list
  if it is taking >.25ms to build.

Change-Id: I568dd74beedf9a0a5a4c88ab567510cee9af8299

13 years agoam 8fdaff05: am f4d359d3: (-s ours) Remove Search from the system Settings app DO...
Bjorn Bringert [Mon, 20 Sep 2010 19:58:42 +0000 (12:58 -0700)]
am 8fdaff05: am f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE

Merge commit '8fdaff05d1154c93b467b9647b8fc2702eca1699' into gingerbread-plus-aosp

* commit '8fdaff05d1154c93b467b9647b8fc2702eca1699':
  Remove Search from the system Settings app DO NOT MERGE

13 years agoam f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Mon, 20 Sep 2010 19:48:11 +0000 (12:48 -0700)]
am f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE

Merge commit 'f4d359d3c83d0e84319603ecc0f4dce120708612' into gingerbread

* commit 'f4d359d3c83d0e84319603ecc0f4dce120708612':
  Remove Search from the system Settings app DO NOT MERGE

13 years agoSupport showing "Cold" battery health.
Imre Sunyi [Mon, 20 Sep 2010 16:02:28 +0000 (18:02 +0200)]
Support showing "Cold" battery health.

The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idfc7029fabcdfdaaf2b5c95977c11e0eb3fd76a7

13 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

13 years agoam cb818619: Update power usage UI to follow WIFI data changes.
Dianne Hackborn [Fri, 17 Sep 2010 22:20:06 +0000 (15:20 -0700)]
am cb818619: Update power usage UI to follow WIFI data changes.

Merge commit 'cb818619c669d4257a4df969dd03eff479ba84d0' into gingerbread-plus-aosp

* commit 'cb818619c669d4257a4df969dd03eff479ba84d0':
  Update power usage UI to follow WIFI data changes.

13 years agoUpdate power usage UI to follow WIFI data changes.
Dianne Hackborn [Thu, 16 Sep 2010 08:29:54 +0000 (01:29 -0700)]
Update power usage UI to follow WIFI data changes.

Now handles WIFI start times being distributed across applications,
and collapses all work done in WIFI uid procs (esp that supplicant
thing) into the apps and overall WIFI category.

Change-Id: I341e5d63c45eeb0fb4121beed62474d947f9de11

13 years agoam 213d579f: Merge "Don\'t disconnect the same device before connecting." into ginger...
Jaikumar Ganesh [Fri, 17 Sep 2010 05:15:50 +0000 (22:15 -0700)]
am 213d579f: Merge "Don\'t disconnect the same device before connecting." into gingerbread

Merge commit '213d579f98a83145989f11cfdbd47631b64de000' into gingerbread-plus-aosp

* commit '213d579f98a83145989f11cfdbd47631b64de000':
  Don't disconnect the same device before connecting.

13 years agoMerge "Don't disconnect the same device before connecting." into gingerbread
Jaikumar Ganesh [Fri, 17 Sep 2010 02:08:32 +0000 (19:08 -0700)]
Merge "Don't disconnect the same device before connecting." into gingerbread

13 years agoDon't disconnect the same device before connecting.
Jaikumar Ganesh [Fri, 17 Sep 2010 01:24:42 +0000 (18:24 -0700)]
Don't disconnect the same device before connecting.

We Pair: Remote device sends incoming connection, we get connected.
We get BondingState change and we connect.
Settings app disconnects connected profiles and then connects
without checking whether we are disconnecting the same device itself.

How was it working before ? Settings app used to queue all
commands. The disconnect followed by the connect would work
but unnecessarily disconnect and then connect.
With the queuing moved to framework, the connect fails
since the disconnect status has not been broadcasted.

Settings app shouldn't be disconnecting connected profiles.
That logic should reside in the framework. There is an open bug
and when the new APIs get implemented this will get removed.

Change-Id: I32a7fa36ff3c3321691c55071498f985dcdcfe8e

13 years agoam 5c2a4684: Merge "Supercalifragilisticexpialidocious." into gingerbread
Dianne Hackborn [Tue, 14 Sep 2010 19:33:38 +0000 (12:33 -0700)]
am 5c2a4684: Merge "Supercalifragilisticexpialidocious." into gingerbread

Merge commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119' into gingerbread-plus-aosp

* commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119':
  Supercalifragilisticexpialidocious.

13 years agoMerge "Supercalifragilisticexpialidocious." into gingerbread
Dianne Hackborn [Tue, 14 Sep 2010 19:31:20 +0000 (12:31 -0700)]
Merge "Supercalifragilisticexpialidocious." into gingerbread

13 years agoSupercalifragilisticexpialidocious.
Dianne Hackborn [Tue, 14 Sep 2010 01:47:37 +0000 (18:47 -0700)]
Supercalifragilisticexpialidocious.

Change-Id: Ifaece97c80b859cb455eab56230e076eca916f4a

13 years agoam c5c8dad0: Use new apply() instead of commit().
Brad Fitzpatrick [Tue, 14 Sep 2010 17:29:35 +0000 (10:29 -0700)]
am c5c8dad0: Use new apply() instead of commit().

Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp

* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
  Use new apply() instead of commit().

13 years agoUse new apply() instead of commit().
Brad Fitzpatrick [Tue, 14 Sep 2010 16:26:51 +0000 (09:26 -0700)]
Use new apply() instead of commit().

apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9

13 years agoam e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Jaikumar Ganesh [Mon, 13 Sep 2010 18:52:15 +0000 (11:52 -0700)]
am e714898a: Merge "OutOfband pairing user dialog." into gingerbread

Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp

* commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120':
  OutOfband pairing user dialog.

13 years agoMerge "OutOfband pairing user dialog." into gingerbread
Jaikumar Ganesh [Mon, 13 Sep 2010 18:43:01 +0000 (11:43 -0700)]
Merge "OutOfband pairing user dialog." into gingerbread

13 years agoam e5e4282a: Enable the call setting when the VoIP feature is supported.
Chung-yih Wang [Sat, 11 Sep 2010 02:52:31 +0000 (19:52 -0700)]
am e5e4282a: Enable the call setting when the VoIP feature is supported.

Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp

* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
  Enable the call setting when the VoIP feature is supported.

13 years agoEnable the call setting when the VoIP feature is supported.
Chung-yih Wang [Sat, 11 Sep 2010 02:24:46 +0000 (10:24 +0800)]
Enable the call setting when the VoIP feature is supported.

If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.

Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787

13 years agoam 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home...
Jean-Baptiste Queru [Fri, 10 Sep 2010 22:47:21 +0000 (15:47 -0700)]
am 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."

Merge commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6' into gingerbread-plus-aosp

* commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6':
  Allow users to create shortcuts to the VPN settings on the Home Screen.

13 years agoam 33319b12: Bluetooth PIN is not password style
Erik Ljungberg [Fri, 10 Sep 2010 22:47:18 +0000 (15:47 -0700)]
am 33319b12: Bluetooth PIN is not password style

Merge commit '33319b1228d8af25797e1371b088fc8491349c21' into gingerbread-plus-aosp

* commit '33319b1228d8af25797e1371b088fc8491349c21':
  Bluetooth PIN is not password style

13 years agoMerge "Allow users to create shortcuts to the VPN settings on the Home Screen."
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:27:49 +0000 (14:27 -0700)]
Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."