OSDN Git Service
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.
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
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
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
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
Eric Fischer [Wed, 6 Oct 2010 18:56:08 +0000 (11:56 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
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.
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
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.
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
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.
Dianne Hackborn [Fri, 1 Oct 2010 02:03:55 +0000 (19:03 -0700)]
Merge "Fix android:allowClearUserData." into gingerbread
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
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
Eric Fischer [Thu, 30 Sep 2010 22:48:14 +0000 (15:48 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
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.
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
Ken Wakasa [Thu, 30 Sep 2010 03:52:52 +0000 (12:52 +0900)]
Update strings for physical keyboard settings.
bug:
2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
Gilles Debunne [Wed, 29 Sep 2010 23:02:13 +0000 (16:02 -0700)]
New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
Eric Fischer [Wed, 29 Sep 2010 21:36:34 +0000 (14:36 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
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...)
Gilles Debunne [Wed, 29 Sep 2010 19:18:12 +0000 (12:18 -0700)]
Merge "New assets (wifi, bluetooth...)" into gingerbread
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.
Gilles Debunne [Wed, 29 Sep 2010 19:10:37 +0000 (12:10 -0700)]
New assets (wifi, bluetooth...)
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
Eric Fischer [Tue, 28 Sep 2010 23:35:31 +0000 (16:35 -0700)]
Split strings with SD card references into variations.
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
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.
Ken Wakasa [Tue, 28 Sep 2010 10:01:17 +0000 (19:01 +0900)]
Revise the Language & keyboard settings layout.
bug:
2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
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.
Nick Pelly [Wed, 29 Sep 2010 05:32:51 +0000 (22:32 -0700)]
Merge "Add NFC checkbox to Settings app." into gingerbread
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
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.
Chris Palmer [Tue, 28 Sep 2010 17:34:43 +0000 (10:34 -0700)]
Merge "Improve the add-device-admin layout." into gingerbread
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
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
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
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
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
Eric Fischer [Mon, 27 Sep 2010 19:27:55 +0000 (12:27 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:21:49 +0000 (12:21 -0700)]
Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
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.
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
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
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
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:50 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b
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.
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."
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.
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
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
Eric Fischer [Fri, 24 Sep 2010 17:26:20 +0000 (10:26 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
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.
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
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
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
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
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:
Dianne Hackborn [Tue, 21 Sep 2010 00:06:58 +0000 (17:06 -0700)]
Merge "Some improvements to the manage apps code:" into gingerbread
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
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
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
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
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.
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
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.
Jaikumar Ganesh [Fri, 17 Sep 2010 02:08:32 +0000 (19:08 -0700)]
Merge "Don't disconnect the same device before connecting." into gingerbread
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
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.
Dianne Hackborn [Tue, 14 Sep 2010 19:31:20 +0000 (12:31 -0700)]
Merge "Supercalifragilisticexpialidocious." into gingerbread
Dianne Hackborn [Tue, 14 Sep 2010 01:47:37 +0000 (18:47 -0700)]
Supercalifragilisticexpialidocious.
Change-Id: Ifaece97c80b859cb455eab56230e076eca916f4a
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().
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
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.
Jaikumar Ganesh [Mon, 13 Sep 2010 18:43:01 +0000 (11:43 -0700)]
Merge "OutOfband pairing user dialog." into gingerbread
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.
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
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.
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
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."
Eric Fischer [Fri, 10 Sep 2010 20:24:06 +0000 (13:24 -0700)]
am
be45f642: Import revised translations. DO NOT MERGE
Merge commit '
be45f642cafdd27e5ffeb79b13aa3e33a83ae823' into gingerbread-plus-aosp
* commit '
be45f642cafdd27e5ffeb79b13aa3e33a83ae823':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Sep 2010 20:07:48 +0000 (13:07 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
Jaikumar Ganesh [Thu, 9 Sep 2010 00:51:19 +0000 (17:51 -0700)]
OutOfband pairing user dialog.
Change-Id: I2f996067b983ad4678814040eb0773fa3968be13
Eric Fischer [Tue, 7 Sep 2010 18:11:00 +0000 (11:11 -0700)]
am
1a886f80: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '
1a886f805be579ed2f32c861870e35aba37111bd' into gingerbread-plus-aosp
* commit '
1a886f805be579ed2f32c861870e35aba37111bd':
Preserve old translations for changed strings. DO NOT MERGE
Eric Fischer [Tue, 7 Sep 2010 18:04:17 +0000 (11:04 -0700)]
Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Erik Ljungberg [Mon, 6 Sep 2010 16:19:36 +0000 (18:19 +0200)]
Bluetooth PIN is not password style
Bluetooth PIN is changed to password style to
comform with how passwords are normally shown
in the UI.
Change-Id: I293e94cf3766f9b5b82b9bb89e5aed4bd494ef71
Eric Fischer [Fri, 3 Sep 2010 21:57:32 +0000 (14:57 -0700)]
Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
Dianne Hackborn [Fri, 3 Sep 2010 20:29:51 +0000 (13:29 -0700)]
am
2d5cd1df: Follow rename.
Merge commit '
2d5cd1dfbc635fef3321694f33faf38ffa993d3f' into gingerbread-plus-aosp
* commit '
2d5cd1dfbc635fef3321694f33faf38ffa993d3f':
Follow rename.
Dianne Hackborn [Fri, 3 Sep 2010 19:53:20 +0000 (12:53 -0700)]
Follow rename.
Change-Id: I255df1429b999943d7b3d2ca2b453045f195fdb9
Dianne Hackborn [Fri, 3 Sep 2010 02:02:47 +0000 (19:02 -0700)]
am
02930093: Fix issue #
2905454: Crash observed while accessing Battery history page on passion/GRG40
Merge commit '
0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp
* commit '
0293009389eb3a4e8a3f2d08060e864f53f3c532':
Fix issue #
2905454: Crash observed while accessing Battery history page on passion/GRG40
Dianne Hackborn [Fri, 3 Sep 2010 01:19:02 +0000 (18:19 -0700)]
Fix issue #
2905454: Crash observed while accessing Battery history page on passion/GRG40
Change-Id: Ifd08744d909c2d87e5cdf4eedcc5af1a86548e60
Erik Ljungberg [Thu, 2 Sep 2010 05:04:59 +0000 (22:04 -0700)]
am
83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.
Merge commit '
83c3b64ff7235e1382712a899ab0a269ce8a28d6' into gingerbread-plus-aosp
* commit '
83c3b64ff7235e1382712a899ab0a269ce8a28d6':
BT: The Phone doesn't "wake up" when trying to pair with it.
Erik Ljungberg [Thu, 19 Aug 2010 15:47:44 +0000 (17:47 +0200)]
BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
notification sound is added
- When the screen is off notification is always used.
Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
Dianne Hackborn [Wed, 1 Sep 2010 02:03:31 +0000 (19:03 -0700)]
am
5774d5d3: Show correct process dependency for providers.
Merge commit '
5774d5d34b2339135feab01b998fcd111ebdde4d' into gingerbread-plus-aosp
* commit '
5774d5d34b2339135feab01b998fcd111ebdde4d':
Show correct process dependency for providers.
Dianne Hackborn [Tue, 31 Aug 2010 00:43:05 +0000 (17:43 -0700)]
Show correct process dependency for providers.
Use the new API that allows us to always retrieve the desired
provider info.
Change-Id: I9265d8f169ee34c87f0ca89315ee78bb2ae49674
Brad Fitzpatrick [Mon, 30 Aug 2010 19:33:48 +0000 (12:33 -0700)]
am
22aa2130: Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Merge commit '
22aa2130fe40952d477a998ba60dea99ada32711' into gingerbread-plus-aosp
* commit '
22aa2130fe40952d477a998ba60dea99ada32711':
Make power control widget be more responsive. Fix StrictMode violations.
Eric Fischer [Mon, 30 Aug 2010 19:33:01 +0000 (12:33 -0700)]
am
92669a51: Import revised translations. DO NOT MERGE
Merge commit '
92669a512a80fb99b71cbdf22aca9d91ae006b01' into gingerbread-plus-aosp
* commit '
92669a512a80fb99b71cbdf22aca9d91ae006b01':
Import revised translations. DO NOT MERGE
Brad Fitzpatrick [Mon, 30 Aug 2010 18:35:23 +0000 (11:35 -0700)]
Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Eric Fischer [Sat, 28 Aug 2010 00:17:47 +0000 (17:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
Brad Fitzpatrick [Fri, 27 Aug 2010 23:59:41 +0000 (16:59 -0700)]
Make power control widget be more responsive. Fix StrictMode violations.
Also use new location providers changed broadcast intent, and fix a bug
introduced in Froyo where we stopped observing the SYSTEM_CLOSE_DIALOGS
intent so we fell out of sync (more often) with the sync settings.
Now even responsive during the boot I/O storm! (except for toggling
brightness, which still does disk writes from the UI thread...)
BUG=
2956025
Change-Id: I77876ff6e0be2325c15d5f08bb2970edf233f839
Jean-Michel Trivi [Thu, 26 Aug 2010 00:31:26 +0000 (17:31 -0700)]
am
a457719c: Add new string for the notification to be displayed when the user installs a new TTS engine.
Merge commit '
a457719c5042f944540f76c03b5e61ecd0ffae39' into gingerbread-plus-aosp
* commit '
a457719c5042f944540f76c03b5e61ecd0ffae39':
Add new string for the notification to be displayed when the user
Jean-Michel Trivi [Wed, 25 Aug 2010 22:43:17 +0000 (15:43 -0700)]
Add new string for the notification to be displayed when the user
installs a new TTS engine.
Change-Id: If370cc40b0da858ec838711190d6b660b1c34ebf