OSDN Git Service
Amith Yamasani [Tue, 28 Feb 2012 17:34:05 +0000 (09:34 -0800)]
Merge "Don't crash if there's no bluetooth functionality (such as in an emulator)"
Amith Yamasani [Tue, 28 Feb 2012 01:09:37 +0000 (17:09 -0800)]
Don't crash if there's no bluetooth functionality (such as in an emulator)
Bug:
6079494
Change-Id: I12f729134407eaa719dc6a25e89a3b48476985e2
Eric Fischer [Mon, 27 Feb 2012 23:53:10 +0000 (15:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I227e80744e9b0a7fb4a05f42d77592bbf0f33e21
Robert Greenwalt [Fri, 24 Feb 2012 23:00:21 +0000 (15:00 -0800)]
Merge "Use the framework rather than RIL constants"
Jeff Sharkey [Fri, 24 Feb 2012 01:25:33 +0000 (17:25 -0800)]
Merge "Reduce string lengths to fit on narrow screens."
Jeff Sharkey [Fri, 24 Feb 2012 01:24:35 +0000 (17:24 -0800)]
Reduce string lengths to fit on narrow screens.
Bug:
5780676
Change-Id: I841bc6c9a358af9dcf31badf5b3545ad6ec885fe
Eric Fischer [Thu, 23 Feb 2012 22:25:07 +0000 (14:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2c4f903d7850328ebc3ea3e89f4b9eb121d9d2cc
Daisuke Miyakawa [Thu, 23 Feb 2012 02:35:26 +0000 (18:35 -0800)]
Merge "Remove "Vibrate and ring" option"
Daisuke Miyakawa [Wed, 22 Feb 2012 22:08:43 +0000 (14:08 -0800)]
Remove "Vibrate and ring" option
It will be part of Phone's settings. See Ifb19b53b850ee8a4c15
Bug:
6029673
Change-Id: I7168ed140266a7c754fb3d7209cf12e73041c306
Eric Fischer [Wed, 22 Feb 2012 22:16:48 +0000 (14:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I32958249019d55f0f7301fa5a37879f562b31345
Eric Fischer [Tue, 21 Feb 2012 22:18:22 +0000 (14:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7547b6ad8816a57f6dff7dd61c47bf6525090daf
Irfan Sheriff [Sat, 18 Feb 2012 00:05:44 +0000 (16:05 -0800)]
Merge "Fix cursor position for password"
Irfan Sheriff [Sat, 18 Feb 2012 00:04:05 +0000 (16:04 -0800)]
Fix cursor position for password
Bug:
5757292
Change-Id: Iad34b09ee56c24694ebf45350f0dbc398f2cfa06
Eric Fischer [Fri, 17 Feb 2012 23:58:31 +0000 (15:58 -0800)]
Import translations.
Change-Id: I1e023de5eab792b15df68fa6bdffdb0d6118a876
Robert Greenwalt [Fri, 17 Feb 2012 23:25:14 +0000 (15:25 -0800)]
Use the framework rather than RIL constants
bug:
5717664
Change-Id: I07f8fe3a874aff775e4be8513cd020bf9d090b6a
Eric Fischer [Fri, 17 Feb 2012 05:11:25 +0000 (21:11 -0800)]
Merge "Import translations."
Dianne Hackborn [Thu, 16 Feb 2012 23:11:18 +0000 (15:11 -0800)]
Fix issue #
6026576 de_source_broad_Android - GoogleJob [192291 / - ]
-GTT_request character limit extension
Change-Id: Id0ef1c025dca8f8cbd7914f551d897ce9b044763
Eric Fischer [Thu, 16 Feb 2012 22:56:08 +0000 (14:56 -0800)]
Import translations.
Change-Id: I465465b1b620e22dcdcf642e4c12ebee1aff3da7
The Android Open Source Project [Thu, 16 Feb 2012 19:25:36 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 19:25:22 +0000 (11:25 -0800)]
The Android Open Source Project [Thu, 16 Feb 2012 18:13:50 +0000 (10:13 -0800)]
am
cff569f1: Reconcile with ics-mr1-release
* commit '
cff569f11cb4960ce5299bf6c198eeb7945dc224':
The Android Open Source Project [Thu, 16 Feb 2012 18:11:02 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e
The Android Open Source Project [Thu, 16 Feb 2012 18:06:42 +0000 (10:06 -0800)]
am
7b276302: Reconcile with ics-mr1-release
* commit '
7b2763021750a2d138eaa20ee2d2828d83d1720c':
The Android Open Source Project [Thu, 16 Feb 2012 18:03:02 +0000 (10:03 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235
Eric Fischer [Wed, 15 Feb 2012 22:34:26 +0000 (14:34 -0800)]
Import translations.
Change-Id: Ied8b68c4e16a93835b769dc05a38f066d0b43837
Eric Fischer [Wed, 15 Feb 2012 00:08:03 +0000 (16:08 -0800)]
Merge "Import translations."
Eric Fischer [Wed, 15 Feb 2012 00:00:20 +0000 (16:00 -0800)]
Import translations.
Change-Id: I998fa1d4ddeec81d4532143ed5313db39f53bbde
Irfan Sheriff [Tue, 14 Feb 2012 23:39:09 +0000 (15:39 -0800)]
Merge "Concurrency wifi p2p and client operation support"
The Android Automerger [Tue, 14 Feb 2012 22:17:08 +0000 (14:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 14 Feb 2012 22:07:03 +0000 (14:07 -0800)]
Merge "Add debug app / wait for debugger dev options."
Dianne Hackborn [Tue, 14 Feb 2012 21:25:41 +0000 (13:25 -0800)]
Add debug app / wait for debugger dev options.
Re-organize dev options a bit.
Change-Id: I291b177c87cb8fb4bd8316d05aa6eadfaaf5f0d2
Irfan Sheriff [Tue, 14 Feb 2012 06:35:09 +0000 (22:35 -0800)]
Irfan Sheriff [Tue, 14 Feb 2012 06:33:14 +0000 (22:33 -0800)]
Merge "Fix NPE"
Irfan Sheriff [Tue, 14 Feb 2012 06:28:13 +0000 (22:28 -0800)]
Fix NPE
Bug:
5953080
Change-Id: I1ff5b8a878f8f0d2fd9c6da549804aa454db444c
Jean Chalard [Tue, 14 Feb 2012 05:56:28 +0000 (21:56 -0800)]
am
3585bb1f: Add a limit to user dictionary words length
* commit '
3585bb1f396c26903ddf5817f8a220a169e2413e':
Add a limit to user dictionary words length
Jean Chalard [Tue, 14 Feb 2012 05:20:22 +0000 (14:20 +0900)]
Add a limit to user dictionary words length
Bug:
5998772
Change-Id: I914f2caa60a157f40cf5e05a1076153036cd4073
Eric Fischer [Tue, 14 Feb 2012 00:47:44 +0000 (16:47 -0800)]
am
13eafb3a: Import translations.
* commit '
13eafb3aa586a09340b61e00ca383a561320ba12':
Import translations.
Eric Fischer [Mon, 13 Feb 2012 22:45:19 +0000 (14:45 -0800)]
Import translations.
Change-Id: I99e69089428032d1e96bf2f2917ea1a44cb77fed
Eric Fischer [Mon, 13 Feb 2012 22:42:51 +0000 (14:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8db6fb3a1ddfea8332dcac9ef50245a98bed4216
Mike J. Chen [Fri, 10 Feb 2012 23:36:30 +0000 (15:36 -0800)]
am
31c5ec82: Allows auto dismissing of bluetooth activation dialogs
* commit '
31c5ec82021271f2e1745a2de37c543e67dcec17':
Allows auto dismissing of bluetooth activation dialogs
Mike J. Chen [Thu, 8 Sep 2011 16:49:28 +0000 (09:49 -0700)]
Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.
Change-Id: Ib76a26d440ede34cc8a41ffc8b680ca2b20b38ca
Signed-off-by: Mike J. Chen <mjchen@google.com>
Eric Fischer [Fri, 10 Feb 2012 21:45:53 +0000 (13:45 -0800)]
am
0db01ad8: Import translations.
* commit '
0db01ad8389ff184a7f4bafc0bef4945b10e5b4e':
Import translations.
Eric Fischer [Fri, 10 Feb 2012 21:43:39 +0000 (13:43 -0800)]
Import translations.
Change-Id: Iea65c9bdba3fa2c3591d9318e9fe2d25b1e897fa
Eric Fischer [Fri, 10 Feb 2012 21:41:44 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9c77db7d2f6e1b9e9875fd30c8355839b4763280
Eric Fischer [Fri, 10 Feb 2012 18:57:28 +0000 (10:57 -0800)]
am
644cc9a4: am
41e16eaa: (-s ours) am
8b24b374: am
78ef5443: Import translations. DO NOT MERGE
* commit '
644cc9a484e76dad61f067d264be38c91fd0d085':
Eric Fischer [Fri, 10 Feb 2012 18:54:05 +0000 (10:54 -0800)]
am
41e16eaa: (-s ours) am
8b24b374: am
78ef5443: Import translations. DO NOT MERGE
* commit '
41e16eaa038fe4adeb8a3566b440aa23c1928c98':
Eric Fischer [Fri, 10 Feb 2012 18:49:56 +0000 (10:49 -0800)]
am
8b24b374: am
78ef5443: Import translations. DO NOT MERGE
* commit '
8b24b374139e608182515b56ec6f7b87a8293024':
Eric Fischer [Fri, 10 Feb 2012 18:24:57 +0000 (10:24 -0800)]
am
36250d94: am
10d7fe69: (-s ours) am
ecd9c570: (-s ours) am
78ef5443: Import translations. DO NOT MERGE
* commit '
36250d94fa32d1585c5e3120b5992faefe46642c':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:20:15 +0000 (10:20 -0800)]
am
10d7fe69: (-s ours) am
ecd9c570: (-s ours) am
78ef5443: Import translations. DO NOT MERGE
* commit '
10d7fe69320297eb82ba089c2d689f30533d48ba':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:16:08 +0000 (10:16 -0800)]
am
ecd9c570: (-s ours) am
78ef5443: Import translations. DO NOT MERGE
* commit '
ecd9c570f767040e8c021aa6ed995894c0d8d754':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:13:38 +0000 (10:13 -0800)]
am
78ef5443: Import translations. DO NOT MERGE
* commit '
78ef5443a66ee01d75d89227bfd078706184662c':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:12:35 +0000 (10:12 -0800)]
am
78ef5443: Import translations. DO NOT MERGE
* commit '
78ef5443a66ee01d75d89227bfd078706184662c':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 21:08:55 +0000 (13:08 -0800)]
am
eb854f12: Import translations. DO NOT MERGE
* commit '
eb854f12c8b69ad214f336cedf6c612109261fcc':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 20:17:27 +0000 (12:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I742d9a6907c7f77a0509377b454b22fe4e48109d
Eric Fischer [Thu, 9 Feb 2012 20:15:25 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iff2d3267c9cd2681f4708be32344ba3d3af3755c
Eric Fischer [Thu, 9 Feb 2012 03:08:43 +0000 (19:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
Eric Fischer [Wed, 8 Feb 2012 21:45:27 +0000 (13:45 -0800)]
am
353254fc: Import translations. DO NOT MERGE
* commit '
353254fc43d1c4a94013901f2f56e8b57d716921':
Import translations. DO NOT MERGE
Eric Fischer [Wed, 8 Feb 2012 21:41:58 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifd8e0ba2a2854044b31cb2a7fd2fd8b705b4aa1e
Eric Fischer [Wed, 8 Feb 2012 21:40:44 +0000 (13:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9593432f24c466c8badc408e80796934e0db57cb
satok [Wed, 8 Feb 2012 03:30:13 +0000 (19:30 -0800)]
am
c7f8da67: Merge "Update the title for the spell checker"
* commit '
c7f8da67035e834b0ac8945ce62604a017ff7db1':
Update the title for the spell checker
satok [Wed, 8 Feb 2012 03:28:14 +0000 (19:28 -0800)]
Merge "Update the title for the spell checker"
satok [Wed, 8 Feb 2012 02:10:32 +0000 (11:10 +0900)]
Update the title for the spell checker
Bug:
5819988
Change-Id: I5420313f319eb447087b69dcda5b7c93bffc74b5
Dianne Hackborn [Tue, 7 Feb 2012 21:48:39 +0000 (13:48 -0800)]
am
e44f44d6: New dev setting to turn off HW overlays.
* commit '
e44f44d67913ae74900656ee2ef1d2f690c63d1c':
New dev setting to turn off HW overlays.
Dianne Hackborn [Tue, 7 Feb 2012 05:21:39 +0000 (21:21 -0800)]
New dev setting to turn off HW overlays.
Change-Id: I747ac6d90dfb8a7a0bbf547ce7cae8ee86f8d5d0
Eric Fischer [Tue, 7 Feb 2012 19:10:51 +0000 (11:10 -0800)]
am
057cbfda: Import translations. DO NOT MERGE
* commit '
057cbfdad6db024eec8b956d1260a8b0515dc86e':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 7 Feb 2012 19:01:28 +0000 (11:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I409990d7cb8653f957aef23a8c2407f41a4b5214
Eric Fischer [Tue, 7 Feb 2012 18:59:45 +0000 (10:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: If12ef4016e7d5ce9c2897d77bf4e572eefff84cd
Eric Fischer [Mon, 6 Feb 2012 20:54:37 +0000 (12:54 -0800)]
am
cf0a7630: am
b0d203c3: (-s ours) am
4bec429d: Import translations. DO NOT MERGE
* commit '
cf0a7630c5aa2f8715133f8d0cbfca1a334077d0':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:52:29 +0000 (12:52 -0800)]
am
b0d203c3: (-s ours) am
4bec429d: Import translations. DO NOT MERGE
* commit '
b0d203c395ddc16860241381032a5c8b8e870e60':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:51:42 +0000 (12:51 -0800)]
am
4fe24270: Import translations. DO NOT MERGE
* commit '
4fe2427034f95016b6fd18286e24076e668cea8f':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:50:21 +0000 (12:50 -0800)]
am
4bec429d: Import translations. DO NOT MERGE
* commit '
4bec429dd5a6f22b3a23aff8ed29b7a68786bba5':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:44:41 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia6cf10c2506a1b4580db7040b98d71ee68715990
Eric Fischer [Mon, 6 Feb 2012 20:43:39 +0000 (12:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I615776e4f0521a14747ecf6f9e7f8a695bc128b9
Eric Fischer [Mon, 6 Feb 2012 20:41:31 +0000 (12:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I100fd81ce60034dac1cddc8a8631c16087044929
Jeff Sharkey [Sat, 4 Feb 2012 03:33:57 +0000 (19:33 -0800)]
am
f3871fb2: Linear bytes scale, time ticks on first week day.
* commit '
f3871fb2b232cd22469ccc66415f82de4995894e':
Linear bytes scale, time ticks on first week day.
Jeff Sharkey [Sat, 4 Feb 2012 03:27:07 +0000 (19:27 -0800)]
Linear bytes scale, time ticks on first week day.
Move bytes to linear instead of logarithmic scale. Also render time
ticks on first week day based on locale. Also enable testing of
specific IMSI through setprop.
Bug:
5452612,
5829693
Change-Id: I13200cf58a39bfe0ac343e1f83165e899867641b
Jeff Sharkey [Fri, 3 Feb 2012 23:54:07 +0000 (15:54 -0800)]
am
47e1c0bd: Merge "Tighten locking around data usage UID resolution."
* commit '
47e1c0bd47796fcd2b15423ba64e68a4df6e00a8':
Tighten locking around data usage UID resolution.
Jeff Sharkey [Fri, 3 Feb 2012 23:51:40 +0000 (15:51 -0800)]
Merge "Tighten locking around data usage UID resolution."
Jeff Sharkey [Fri, 3 Feb 2012 23:47:39 +0000 (15:47 -0800)]
Tighten locking around data usage UID resolution.
Bug:
5965853
Change-Id: I92231ca938ddf320377c437c7379a03319c88aca
Eric Fischer [Fri, 3 Feb 2012 23:09:41 +0000 (15:09 -0800)]
am
15ebeec4: am
f215bfff: (-s ours) am
117bfe86: Import translations. DO NOT MERGE
* commit '
15ebeec4f2a72e88701e5f4586e350edc8f1c58f':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 23:07:00 +0000 (15:07 -0800)]
am
f215bfff: (-s ours) am
117bfe86: Import translations. DO NOT MERGE
* commit '
f215bfff60aab5b9708b376eeedd033a8ad5418e':
Import translations. DO NOT MERGE
Jeff Sharkey [Fri, 3 Feb 2012 22:59:21 +0000 (14:59 -0800)]
am
77dae917: Unify shorthand for byte-based units.
* commit '
77dae91726864c2c88ac317aff6bd086ca468e54':
Unify shorthand for byte-based units.
Jeff Sharkey [Fri, 3 Feb 2012 22:50:33 +0000 (14:50 -0800)]
Unify shorthand for byte-based units.
Change-Id: I32f998b5ee1f5416c9cceafd124fd34b7433be42
Eric Fischer [Fri, 3 Feb 2012 21:55:51 +0000 (13:55 -0800)]
am
5c474987: Import translations. DO NOT MERGE
* commit '
5c474987ae12b705ecf5310134f72f030f15bc2d':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 21:54:46 +0000 (13:54 -0800)]
am
117bfe86: Import translations. DO NOT MERGE
* commit '
117bfe86cd1b71b35bef4069a2bbd8452cd37a43':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 20:47:43 +0000 (12:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ice4cc1cd0d6b9ec2b7eca8cec68ff36aa8d49945
Eric Fischer [Fri, 3 Feb 2012 20:46:38 +0000 (12:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923
Eric Fischer [Fri, 3 Feb 2012 20:44:20 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iecfdf16111ff8870a29cbc4d2b1280699d2997a2
Jeff Sharkey [Fri, 3 Feb 2012 00:28:34 +0000 (16:28 -0800)]
am
0370b9c3: Merge "Update for NetworkPolicy refactoring."
* commit '
0370b9c3f76584462cffc3c283fcc70d9c8419c1':
Update for NetworkPolicy refactoring.
Jeff Sharkey [Fri, 3 Feb 2012 00:26:46 +0000 (16:26 -0800)]
Merge "Update for NetworkPolicy refactoring."
Jeff Sharkey [Fri, 3 Feb 2012 00:12:00 +0000 (16:12 -0800)]
Update for NetworkPolicy refactoring.
Bug:
5262414
Change-Id: I17db862cc20a11f022dc2d02993ad52988618681
Dianne Hackborn [Thu, 2 Feb 2012 23:20:27 +0000 (15:20 -0800)]
am
840c6bfb: Merge "New switch to enable/disable all developer settings."
* commit '
840c6bfb96201b5e187616c11fa1944b321a65c2':
New switch to enable/disable all developer settings.
Dianne Hackborn [Thu, 2 Feb 2012 23:17:32 +0000 (15:17 -0800)]
Merge "New switch to enable/disable all developer settings."
Dianne Hackborn [Thu, 2 Feb 2012 19:44:08 +0000 (11:44 -0800)]
New switch to enable/disable all developer settings.
Turning the switch on shows a dialog warning the user to not do this.
Turning the switch off resets all development settings.
Change-Id: I052b16e6d220fa60298799ace02e69a8a1a02ef2
Eric Fischer [Thu, 2 Feb 2012 22:33:15 +0000 (14:33 -0800)]
am
6fa18274: am
175f4154: (-s ours) resolved conflicts for merge of
cbbfffca to ics-scoop-plus-aosp
* commit '
6fa18274e5435ba29e9bb3df812fbe980620895c':
Eric Fischer [Thu, 2 Feb 2012 22:31:53 +0000 (14:31 -0800)]
am
175f4154: (-s ours) resolved conflicts for merge of
cbbfffca to ics-scoop-plus-aosp
* commit '
175f4154a6c0ff0917d56d67a1ad22d883eadda2':
Eric Fischer [Thu, 2 Feb 2012 22:07:34 +0000 (14:07 -0800)]
resolved conflicts for merge of
cbbfffca to ics-scoop-plus-aosp
Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc
Eric Fischer [Thu, 2 Feb 2012 22:00:17 +0000 (14:00 -0800)]
resolved conflicts for merge of
67a50f99 to ics-scoop
Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
Eric Fischer [Thu, 2 Feb 2012 21:54:27 +0000 (13:54 -0800)]
am
ce4bce00: am
201a77ea: (-s ours) am
940f2a74: (-s ours) am
67a50f99: Import translations. DO NOT MERGE
* commit '
ce4bce00eb0ef282ebea715dc7cdc7fafce3f84b':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:51:26 +0000 (13:51 -0800)]
am
201a77ea: (-s ours) am
940f2a74: (-s ours) am
67a50f99: Import translations. DO NOT MERGE
* commit '
201a77ea399527da0f69faf14cc26162909f43c7':
Import translations. DO NOT MERGE