OSDN Git Service
Jaikumar Ganesh [Fri, 15 Oct 2010 02:30:08 +0000 (19:30 -0700)]
am
0d5e320c: am
bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread
Merge commit '
0d5e320cdd9cbd76012c0a1aec157e358d05891e'
* commit '
0d5e320cdd9cbd76012c0a1aec157e358d05891e':
Call disconnect / connect without checking the current status
Nick Pelly [Fri, 15 Oct 2010 02:29:44 +0000 (19:29 -0700)]
am
b3c4365d: am
cd99332f: Merge "Update settings app for new NFC API." into gingerbread
Merge commit '
b3c4365d10047eae367b529d98d5a90d052f6393'
* commit '
b3c4365d10047eae367b529d98d5a90d052f6393':
Update settings app for new NFC API.
Jim Miller [Thu, 14 Oct 2010 22:55:04 +0000 (15:55 -0700)]
Merge "Fix
3024528: Initial implementation of owner info to enable dogfooding"
Jim Miller [Thu, 14 Oct 2010 04:11:07 +0000 (21:11 -0700)]
Fix
3024528: Initial implementation of owner info to enable dogfooding
This is a quick UI implementation to allow owner info to be changed
on LockScreen for dogfooding.
Change-Id: I0dc781def594d1c921c44348c130f509798a71f4
Irfan Sheriff [Thu, 14 Oct 2010 18:42:12 +0000 (11:42 -0700)]
limit max length of ssid and password
Bug:
2675734
Change-Id: I58bc6b095c3d03fd06e3768b23c32718dd964516
Signed-off-by: jmzhu <jmzhu@marvell.com>
Kenny Root [Thu, 14 Oct 2010 02:15:02 +0000 (19:15 -0700)]
am
52e8542d: am
737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread
Merge commit '
52e8542d9dfb9c0d9a3530df1d790a0275d27f31'
* commit '
52e8542d9dfb9c0d9a3530df1d790a0275d27f31':
Don't show the sort menu for running process list
Freeman Ng [Thu, 14 Oct 2010 02:09:08 +0000 (19:09 -0700)]
resolved conflicts for merge of
59561e0a to master
Change-Id: I9d031ce8f9627bb5e8b28f867e2890c354856df9
Amith Yamasani [Wed, 13 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "Fix NPE in BT Settings launch from a shortcut."
Roy West [Wed, 13 Oct 2010 22:58:36 +0000 (15:58 -0700)]
am
f233ec77: am
30186392: With luck, final take on bug3076083, re back up settting
Merge commit '
f233ec77eb359aebd0276a27b09c0abe8e0f67ea'
* commit '
f233ec77eb359aebd0276a27b09c0abe8e0f67ea':
With luck, final take on bug3076083, re back up settting
Amith Yamasani [Wed, 13 Oct 2010 20:33:32 +0000 (13:33 -0700)]
Fix NPE in BT Settings launch from a shortcut.
Bug:
3089335
Jaikumar Ganesh [Wed, 13 Oct 2010 02:06:15 +0000 (19:06 -0700)]
am
bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread
Merge commit '
bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp
* commit '
bdf1310707e436db484113d7aa2881c966cddd0f':
Call disconnect / connect without checking the current status
Nick Pelly [Wed, 13 Oct 2010 02:04:17 +0000 (19:04 -0700)]
am
cd99332f: Merge "Update settings app for new NFC API." into gingerbread
Merge commit '
cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp
* commit '
cd99332fee649afd85798499cea5c45a098b8a20':
Update settings app for new NFC API.
Jaikumar Ganesh [Wed, 13 Oct 2010 02:04:01 +0000 (19:04 -0700)]
Merge "Call disconnect / connect without checking the current status" 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
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
Jake Hamby [Tue, 12 Oct 2010 20:18:21 +0000 (13:18 -0700)]
am
d7f7213a: am
4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread
Merge commit '
d7f7213af27fa6c5e476bb8a8d2951feb5e630b5'
* commit '
d7f7213af27fa6c5e476bb8a8d2951feb5e630b5':
Fix bug where car dock sometimes doesn't connect.
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>
Kenny Root [Tue, 12 Oct 2010 19:29:15 +0000 (12:29 -0700)]
am
737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread
Merge commit '
737e91efb15fe5908781bc1cf446d28abc7726e8' into gingerbread-plus-aosp
* commit '
737e91efb15fe5908781bc1cf446d28abc7726e8':
Don't show the sort menu for running process list
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
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
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
Irfan Sheriff [Tue, 12 Oct 2010 16:49:14 +0000 (09:49 -0700)]
am
52ad3f2f: am
566b5bb0: Improve password hint visibility
Merge commit '
52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2'
* commit '
52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2':
Improve password hint visibility
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
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
Jean-Baptiste Queru [Tue, 12 Oct 2010 00:49:52 +0000 (17:49 -0700)]
am
80455f36: am
b84291bb: Merge "Support showing "Cold" battery health."
Merge commit '
80455f367f968f64037dd32b3857891c9681664b'
* commit '
80455f367f968f64037dd32b3857891c9681664b':
Support showing "Cold" battery health.
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
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
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.
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
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
Irfan Sheriff [Mon, 11 Oct 2010 17:26:14 +0000 (10:26 -0700)]
Improve password hint visibility
Bug:
3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
Roy West [Mon, 11 Oct 2010 17:03:48 +0000 (10:03 -0700)]
am
81635077: am
effdd53f: Fix bug3076083 re backup setting strings
Merge commit '
816350778ad2da0024cbd5d1838ecbcea8f018be'
* commit '
816350778ad2da0024cbd5d1838ecbcea8f018be':
Fix bug3076083 re backup setting strings
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.
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:37:59 +0000 (17:37 -0700)]
Merge "Support showing "Cold" battery health."
Roy West [Sun, 10 Oct 2010 19:52:25 +0000 (12:52 -0700)]
Irfan Sheriff [Sun, 10 Oct 2010 19:22:04 +0000 (12:22 -0700)]
Merge "Fix issue with limiting access points"
Roy West [Sun, 10 Oct 2010 18:03:45 +0000 (11:03 -0700)]
Eric Fischer [Sun, 10 Oct 2010 16:06:38 +0000 (09:06 -0700)]
am
5e51c769: (-s ours) am
d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
5e51c769c77cad4d05446d888b0cf742b56a7318'
* commit '
5e51c769c77cad4d05446d888b0cf742b56a7318':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Sun, 10 Oct 2010 16:05:02 +0000 (09:05 -0700)]
resolved conflicts for merge of
10ebf928 to master
Change-Id: I7da3cff9619aa6ecdc860a24d65b5ca9f0b898bc
Jean-Baptiste Queru [Sun, 10 Oct 2010 15:25:21 +0000 (08:25 -0700)]
resolved conflicts for merge of
0eb550ef to master
Change-Id: Id7434c6e95a688bf97786177a8dbecb4c3c5dc95
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
Eric Fischer [Sat, 9 Oct 2010 16:40:24 +0000 (09:40 -0700)]
am
27db062d: (-s ours) am
84c8c175: Import revised translations. DO NOT MERGE
Merge commit '
27db062dd8464d3519d01780daf5516770ee83b8'
* commit '
27db062dd8464d3519d01780daf5516770ee83b8':
Import revised translations. DO NOT MERGE
Roy West [Sat, 9 Oct 2010 16:40:23 +0000 (09:40 -0700)]
Fix bug3076083 re backup setting strings
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
Fabrice Di Meglio [Sat, 9 Oct 2010 00:30:26 +0000 (17:30 -0700)]
Merge "Fix bug #
3077713 (Account Sync status is sometimes not reflecting the real status)"
Fabrice Di Meglio [Sat, 9 Oct 2010 00:09:00 +0000 (17:09 -0700)]
Fix bug #
3077713 (Account Sync status is sometimes not reflecting the real status)
- make status refresh thru onResume()
This issue was a regression from the change to use Fragments
Change-Id: I5e293c4a72bdc70f02ccfe4fc84bfb32e2887fad
Irfan Sheriff [Fri, 8 Oct 2010 23:07:35 +0000 (16:07 -0700)]
Fix issue with limiting access points
There should not be a limit on the general
settings screen to display access points
Change-Id: I81fd438c7464a229f00dcddca359476d8684a349
Irfan Sheriff [Fri, 8 Oct 2010 21:09:54 +0000 (14:09 -0700)]
Merge "Use LinkProperties in WifiSettings UI"
Irfan Sheriff [Tue, 5 Oct 2010 23:14:26 +0000 (16:14 -0700)]
Use LinkProperties in WifiSettings UI
Change-Id: I6f59328173e9550a2822573a9b25517ebbec4024
satok [Fri, 8 Oct 2010 05:48:15 +0000 (14:48 +0900)]
Fix build breakage
- removing final
Change-Id: Ieeff81025b96f55ca9b5577735c74b25333e2b48
satok [Fri, 8 Oct 2010 03:35:38 +0000 (12:35 +0900)]
Fix a bug that IME can't be changed.
- Call InputMethodSubtypePicker instead of InputMethodPicker
Change-Id: Iedd7ffb037a772cc94b0db1dcfc3f75b10572a9c
Roy West [Thu, 7 Oct 2010 22:48:18 +0000 (15:48 -0700)]
Roy West [Thu, 7 Oct 2010 22:15:45 +0000 (15:15 -0700)]
do not merge
Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
Roy West [Thu, 7 Oct 2010 21:04:23 +0000 (14:04 -0700)]
Adam Lesinski [Thu, 7 Oct 2010 19:00:22 +0000 (12:00 -0700)]
Merge "Added widget preview image. NOTE: This image should be replaced by a custom graphic."
Roy West [Thu, 7 Oct 2010 15:34:41 +0000 (08:34 -0700)]
do not merge
Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
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
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
Eric Fischer [Thu, 7 Oct 2010 00:33:02 +0000 (17:33 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 7 Oct 2010 00:15:09 +0000 (17:15 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3
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 [Thu, 7 Oct 2010 00:08:02 +0000 (17:08 -0700)]
am
3e15e4e9: am
6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '
3e15e4e91b69da9091310bf9aadb1bcffcb3137c'
* commit '
3e15e4e91b69da9091310bf9aadb1bcffcb3137c':
Manage apps "on SD card" now shows all apps that can go on SD card.
Irfan Sheriff [Wed, 6 Oct 2010 23:00:38 +0000 (16:00 -0700)]
Merge "Fix style for text colour settings"
Irfan Sheriff [Wed, 6 Oct 2010 22:58:40 +0000 (15:58 -0700)]
Fix style for text colour settings
Bug:
3061128
Change-Id: I8ad81f829bb8c34d2d288a13ce49a14c6e97192d
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
Daisuke Miyakawa [Wed, 6 Oct 2010 20:32:32 +0000 (13:32 -0700)]
Disable buttons during first scan.
Also remove status manager code, as they should not be here.
Bug:
3069020
Change-Id: I6fcf8470066f96b7f608ceb519b0783e44307846
Eric Fischer [Wed, 6 Oct 2010 18:56:08 +0000 (11:56 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
Irfan Sheriff [Wed, 22 Sep 2010 23:09:35 +0000 (16:09 -0700)]
Add proxy UI for wifi
bug:
3039302
Change-Id: I6fee69992ea78459f06ef270af5bf857eff93c44
Amith Yamasani [Tue, 5 Oct 2010 21:03:13 +0000 (14:03 -0700)]
Merge "
3053971 Accessibility settings are not using Fragment APIs for dialogs. +
3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent."
Amith Yamasani [Tue, 5 Oct 2010 18:49:51 +0000 (11:49 -0700)]
Remove singleTop, as it's causing serious problems on the phone. And...
Fix fragment launching from another app - pass along the fragment class name
and bundle from the original intent.
Bug:
3064432
Bug:
3059311 (partial fix)
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
Adam Lesinski [Mon, 4 Oct 2010 23:40:29 +0000 (16:40 -0700)]
Added widget preview image. NOTE: This image should be replaced by a custom graphic.
Change-Id: Ia8abd993b399a9fed567266f699874baa67a09f9
Eric Fischer [Fri, 1 Oct 2010 19:06:18 +0000 (12:06 -0700)]
am
25c52b70: am
340c5c42: Separate the Settings activity name into two different strings.
Merge commit '
25c52b70faceb24cade0f5480c372de3f47bdf79'
* commit '
25c52b70faceb24cade0f5480c372de3f47bdf79':
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.
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
Daisuke Miyakawa [Fri, 1 Oct 2010 16:13:09 +0000 (09:13 -0700)]
Disable Auto-timezone in SetupWizard
Also remove status bar code, as we shouldn't touch it here.
Bug:
3008295
Change-Id: I1ae3f118eae2cacd135d3ec61f1c27993fe2e166
Dianne Hackborn [Fri, 1 Oct 2010 05:14:41 +0000 (22:14 -0700)]
am
3cda486c: am
95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '
3cda486cd23c3739d70681166979a3e0ea439ed3'
* commit '
3cda486cd23c3739d70681166979a3e0ea439ed3':
Fix android:allowClearUserData.
Svetoslav Ganov [Fri, 1 Oct 2010 03:14:38 +0000 (20:14 -0700)]
3053971 Accessibility settings are not using Fragment APIs for dialogs. +
3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent.
Change-Id: Iac7e7a96d8d9f37d1b39c29237b3e2c93381b39b
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 [Fri, 1 Oct 2010 01:13:01 +0000 (18:13 -0700)]
am
ddaf8f49: (-s ours) am
f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
ddaf8f490f8099514c2e3d0767e0838440f3fd1c'
* commit '
ddaf8f490f8099514c2e3d0767e0838440f3fd1c':
Import revised translations. DO NOT MERGE
Freeman Ng [Fri, 1 Oct 2010 00:32:01 +0000 (17:32 -0700)]
keep screen on in setup wizard datetime and wifi settings activities
bug:
3052067
Change-Id: I5378a5f9afd90e6aaadb25e0284188c25dce6b2a
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
Ying Wang [Thu, 30 Sep 2010 20:23:20 +0000 (13:23 -0700)]
Fix proguard flag file dependency.
Change-Id: I32004f93fe66f54647f1c93125425a9646431070
Ken Wakasa [Thu, 30 Sep 2010 18:29:31 +0000 (11:29 -0700)]
am
bc692e83: am
2d6c0b0d: Update strings for physical keyboard settings.
Merge commit '
bc692e83c4b3bcd6c782935bcd1aff50d23143d0'
* commit '
bc692e83c4b3bcd6c782935bcd1aff50d23143d0':
Update strings for physical keyboard settings.
Gilles Debunne [Thu, 30 Sep 2010 18:29:28 +0000 (11:29 -0700)]
am
345fbf92: am
a63b08d9: New assets for power widget: gps, sync
Merge commit '
345fbf926aba9dc743a58ace88545c030a1f43f4'
* commit '
345fbf926aba9dc743a58ace88545c030a1f43f4':
New assets for power widget: gps, sync
Gilles Debunne [Thu, 30 Sep 2010 18:00:10 +0000 (11:00 -0700)]
am
a48d2dbe: am
98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '
a48d2dbeb2691744ec42c3c9fc64f7d17fda357e'
* commit '
a48d2dbeb2691744ec42c3c9fc64f7d17fda357e':
New assets (wifi, bluetooth...)
Eric Fischer [Thu, 30 Sep 2010 17:54:13 +0000 (10:54 -0700)]
resolved conflicts for merge of
cf18672a to master
Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1
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
Ken Wakasa [Thu, 30 Sep 2010 02:39:09 +0000 (11:39 +0900)]
Merge commit '
47ad0cf3' into manualmerge
Conflicts:
res/xml/language_settings.xml
src/com/android/settings/LanguageSettings.java
Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
Gilles Debunne [Wed, 29 Sep 2010 23:02:13 +0000 (16:02 -0700)]
New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
Daisuke Miyakawa [Wed, 29 Sep 2010 23:07:02 +0000 (16:07 -0700)]
Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
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
Eric Fischer [Wed, 29 Sep 2010 21:36:34 +0000 (14:36 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
OSDN Git Service
