OSDN Git Service
Baligh Uddin [Thu, 23 Aug 2012 02:39:04 +0000 (19:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 01:45:51 +0000 (18:45 -0700)]
Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 01:43:54 +0000 (18:43 -0700)]
Simplify User management settings to bare minimum
No need to restrictions or account association at this time.
Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777
Irfan Sheriff [Wed, 22 Aug 2012 21:21:41 +0000 (14:21 -0700)]
Merge "Simplify proxy regex" into jb-mr1-dev
Irfan Sheriff [Wed, 22 Aug 2012 21:19:52 +0000 (14:19 -0700)]
Simplify proxy regex
Bug:
6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d
Baligh Uddin [Wed, 22 Aug 2012 19:58:12 +0000 (12:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a85d98874da3ff59642198c05dccfe50974fdcd
Auto-generated-cl: translation import
Irfan Sheriff [Wed, 22 Aug 2012 18:57:18 +0000 (11:57 -0700)]
Merge "Update view on UI thread" into jb-mr1-dev
Irfan Sheriff [Wed, 22 Aug 2012 18:36:01 +0000 (11:36 -0700)]
Update view on UI thread
Bug:
6970872
Change-Id: I05bec7cb8a8292de522cbfe11c0ecd5a79375014
Jeff Brown [Wed, 22 Aug 2012 06:15:26 +0000 (23:15 -0700)]
Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
Jeff Brown [Wed, 22 Aug 2012 04:13:48 +0000 (21:13 -0700)]
Add a flag to control auto-brightness adjustment.
The feature is still disabled, it's just disabled using
a flag now.
Change-Id: I43ceaa5ab9b7252e3882c8b2d48c9844afb806c3
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:34:56 +0000 (14:34 -0700)]
am
997b1f74: am
578700af: Merge "Settings: disable Lock SIM card till response is received"
* commit '
997b1f74c49314162635c5976fa369dfcd3385fb':
Settings: disable Lock SIM card till response is received
Jean-Baptiste Queru [Tue, 21 Aug 2012 21:33:50 +0000 (14:33 -0700)]
am
578700af: Merge "Settings: disable Lock SIM card till response is received"
* commit '
578700afb1f14c7b3a0ab8c7daa7a1e94628c1cb':
Settings: disable Lock SIM card till response is received
Jean-Baptiste Queru [Tue, 21 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Merge "Settings: disable Lock SIM card till response is received"
Baligh Uddin [Tue, 21 Aug 2012 18:57:11 +0000 (11:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 18:55:13 +0000 (11:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4beb9abb9778e82144be702dbab151a9e47f9c4e
Auto-generated-cl: translation import
Dianne Hackborn [Tue, 21 Aug 2012 18:19:16 +0000 (11:19 -0700)]
Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
Dianne Hackborn [Tue, 21 Aug 2012 00:24:39 +0000 (17:24 -0700)]
Make manage apps UI multi-user aware.
The details screens still need some work.
Change-Id: I850cc9ba9a8db7787fae629ae3cb6c6772c726f5
Jeevaka Badrappan [Sun, 30 Oct 2011 13:54:41 +0000 (15:54 +0200)]
Settings: disable Lock SIM card till response is received
Lock SIM card checkbox is enabled always which results in
allowing the user to change the state even before the
previous change has been completed successfully. Due to
this option, UI ends up in state where it can send
disable Lock SIM card twice resulting in operation
not allowed error from modem.
Change-Id: I0f4a344a8d76720e75accf3a763c3d0e940a0dca
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 9954
Jake Hamby [Tue, 21 Aug 2012 01:08:02 +0000 (18:08 -0700)]
am
0de311b4: am
c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit '
0de311b4956acc6ec05d25707f1075c1b8a38280':
Enable "APN roaming protocol" for all platforms
Jake Hamby [Tue, 21 Aug 2012 01:06:25 +0000 (18:06 -0700)]
am
c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit '
c46455ac7a2ad988700f975bb07558c8580bbe8e':
Enable "APN roaming protocol" for all platforms
Jake Hamby [Tue, 21 Aug 2012 00:27:35 +0000 (17:27 -0700)]
Merge "Enable "APN roaming protocol" for all platforms"
Brian Muramatsu [Mon, 20 Aug 2012 23:58:30 +0000 (16:58 -0700)]
Merge "display wireless charging status" into jb-mr1-dev
Baligh Uddin [Mon, 20 Aug 2012 17:35:09 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd1ece233eb5daf32683069ca5daa04718769c87
Auto-generated-cl: translation import
Baligh Uddin [Fri, 17 Aug 2012 19:09:22 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id94a81adfd0845198795a16aaeb3b29fe7db1807
Auto-generated-cl: translation import
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:57:04 +0000 (08:57 -0700)]
am
71742eb1: am
0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit '
71742eb13276e93d18f6aead10a8f767134ab0af':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:57:03 +0000 (08:57 -0700)]
am
f4cc034e: am
d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit '
f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:55:52 +0000 (08:55 -0700)]
am
0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit '
0c869d694b59a55c8d53b57a12393b55530e798e':
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:55:51 +0000 (08:55 -0700)]
am
d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit '
d61c23b3c20e990c34edfa5b257f558d479218cf':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:51:18 +0000 (08:51 -0700)]
Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:51:14 +0000 (08:51 -0700)]
Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
The Android Open Source Project [Fri, 17 Aug 2012 01:59:04 +0000 (18:59 -0700)]
am
8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41':
The Android Open Source Project [Fri, 17 Aug 2012 01:57:02 +0000 (18:57 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba
The Android Automerger [Fri, 17 Aug 2012 00:57:52 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Baligh Uddin [Thu, 16 Aug 2012 22:01:28 +0000 (15:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 16 Aug 2012 21:46:47 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia37da41da85a756cb59799c52efadf5289eeacf3
Auto-generated-cl: translation import
Dianne Hackborn [Thu, 16 Aug 2012 18:01:57 +0000 (11:01 -0700)]
Rename UserId to UserHandle.
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
Li Wenji [Sat, 11 Feb 2012 03:52:30 +0000 (11:52 +0800)]
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
When click Tethering, the checkbox will be checked and then unchecked,
and finally move to checked states. This causes confusing to end user,
we need to keep Tethering checkbox unchecked before tethering is really
up.
Change-Id: If2314b7dd1369e619dead45af38fd53c7e89c34e
Author: Li Wenji <wenji.li@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 18281
Wu, Hao [Fri, 20 Jul 2012 15:12:14 +0000 (23:12 +0800)]
UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.
Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 27200
Baligh Uddin [Thu, 16 Aug 2012 00:06:43 +0000 (17:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I72f08740932429c34f14ca0a16b2d330e8161e26
Auto-generated-cl: translation import
Jeff Brown [Wed, 15 Aug 2012 17:27:01 +0000 (10:27 -0700)]
Merge "Use new power manager API." into jb-mr1-dev
Baligh Uddin [Wed, 15 Aug 2012 14:59:00 +0000 (07:59 -0700)]
am
8ddcdbd4: (-s ours) am
11665038: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
8ddcdbd494298eb5198643600fb1f8693b618995':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 15 Aug 2012 14:56:52 +0000 (07:56 -0700)]
am
11665038: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
1166503886e834f74953bfdb6f0ee54d6c834249':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 15 Aug 2012 14:54:44 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Wed, 15 Aug 2012 14:48:35 +0000 (07:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 15 Aug 2012 04:53:00 +0000 (21:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If631ddac7c81a880ca6a1c6ddb7b38ff25d9bb2c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 15 Aug 2012 04:51:07 +0000 (21:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
Brian Muramatsu [Tue, 14 Aug 2012 22:13:16 +0000 (15:13 -0700)]
display wireless charging status
- show "Charging (wireless)" when using wireless charger
- change "Discharging" to "Not charging"
bug:
6879638
Change-Id: I20e78f2bde7a526667510b82a030f5952d9dda75
Jeff Brown [Sat, 11 Aug 2012 00:25:19 +0000 (17:25 -0700)]
Use new power manager API.
Change-Id: If0c58a9bee05ec0de434879e78cd95299e54e3fe
Baligh Uddin [Tue, 14 Aug 2012 20:11:58 +0000 (13:11 -0700)]
am
05e16515: (-s ours) am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
05e16515399192130b738446a6c38374cf65e85b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:09:11 +0000 (13:09 -0700)]
am
cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
cb5624b80673e74f26d052f792dc8c9ce6e09a95':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 20:05:18 +0000 (13:05 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Tue, 14 Aug 2012 19:56:06 +0000 (12:56 -0700)]
am
133c8ca5: (-s ours) am
c5acc132: Import translations. DO NOT MERGE
* commit '
133c8ca599315c60bc8b30a4ac2020ceee02fc8e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:55:11 +0000 (12:55 -0700)]
am
c5acc132: Import translations. DO NOT MERGE
* commit '
c5acc132ca3de71c36cca1ebea2635396172ab4a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 14 Aug 2012 19:49:34 +0000 (12:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 14 Aug 2012 19:48:45 +0000 (12:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6675ea178a94e2a8b185f3cc5900e96de4f61c3d
Auto-generated-cl: translation import
Baligh Uddin [Tue, 14 Aug 2012 19:45:33 +0000 (12:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:41:17 +0000 (08:41 -0700)]
am
291389ed: am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
291389ed5ce3c97c7f5ec145f00a6bc68862f8f4':
Fix use of holo drawables in a few more places
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:39:24 +0000 (08:39 -0700)]
am
5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '
5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
Fix use of holo drawables in a few more places
Przemyslaw Szczepaniak [Mon, 13 Aug 2012 15:56:02 +0000 (16:56 +0100)]
Fix for setting TTS language to recently downloaded one
If user added new voice pack, then set it as a default language,
went level back and went to TTS settings again, it ended in crash.
This is because first updateVoiceDetails uses old voice data details
that settings retreived long time ago.
locales preference is hidden until TTs engine returns list of locales.
Change-Id: I33a81ff259c69adb4c051ee693b6c41b93f302d0
Jean-Baptiste Queru [Tue, 14 Aug 2012 15:19:21 +0000 (08:19 -0700)]
Merge "Fix use of holo drawables in a few more places"
Björn Lundén [Mon, 13 Aug 2012 23:25:21 +0000 (01:25 +0200)]
Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
Jeff Sharkey [Mon, 13 Aug 2012 23:03:23 +0000 (16:03 -0700)]
am
865a914f: am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
865a914fb5459dd5d6d676b11a09c95d15f2ef6e':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 23:03:22 +0000 (16:03 -0700)]
am
677e2ff6: am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
677e2ff670eb48adf252e1bb9d1e2e5b3af558ee':
Don't direct to market if no markets installed
Jean-Baptiste Queru [Mon, 13 Aug 2012 23:03:15 +0000 (16:03 -0700)]
am
6fb425e2: am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
6fb425e2805a1c27c048fc954d402f4612cbf74d':
Settings: Use ICS alert drawable
Jeff Sharkey [Mon, 13 Aug 2012 21:11:01 +0000 (14:11 -0700)]
am
42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '
42eb3fb2584b61aa27a4f89dd06817162f69fb3c':
Fix the issue the setting crashes after unmount SD card in landscape
Jeff Sharkey [Mon, 13 Aug 2012 21:11:00 +0000 (14:11 -0700)]
am
d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit '
d7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
Don't direct to market if no markets installed
Baligh Uddin [Mon, 13 Aug 2012 20:27:25 +0000 (13:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
Baligh Uddin [Mon, 13 Aug 2012 20:24:26 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
Jeff Sharkey [Mon, 13 Aug 2012 20:17:12 +0000 (13:17 -0700)]
Merge "Fix the issue the setting crashes after unmount SD card in landscape"
Jeff Sharkey [Mon, 13 Aug 2012 20:14:08 +0000 (13:14 -0700)]
Merge "Don't direct to market if no markets installed"
Jean-Baptiste Queru [Mon, 13 Aug 2012 19:02:26 +0000 (12:02 -0700)]
am
eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '
eefa61ed2e8583f659e868f3057f195d7cb2bb11':
Settings: Use ICS alert drawable
Jean-Baptiste Queru [Mon, 13 Aug 2012 18:53:45 +0000 (11:53 -0700)]
Merge "Settings: Use ICS alert drawable"
Amith Yamasani [Sat, 11 Aug 2012 02:31:39 +0000 (19:31 -0700)]
Use UserManager instead of PackageManager for user management
Show Accounts in secondary settings
Move Users & restrictions to Device section
Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
Baligh Uddin [Fri, 10 Aug 2012 18:21:05 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
Przemyslaw Szczepaniak [Thu, 9 Aug 2012 11:50:41 +0000 (12:50 +0100)]
Keep speech rate dialog after rotate
It also adds some missing @Override
Bug:
5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
Baligh Uddin [Fri, 10 Aug 2012 02:50:14 +0000 (19:50 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Chuanxiao Dong [Tue, 24 Jul 2012 05:09:24 +0000 (13:09 +0800)]
Fix the issue the setting crashes after unmount SD card in landscape
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.
Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 26569
Irfan Sheriff [Thu, 9 Aug 2012 22:09:10 +0000 (15:09 -0700)]
Setting to turn off power optimizations
Bug:
5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
Baligh Uddin [Thu, 9 Aug 2012 19:39:18 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
John Spurlock [Thu, 9 Aug 2012 13:18:45 +0000 (06:18 -0700)]
Merge "Fix NPE in Dreams settings." into jb-mr1-dev
John Spurlock [Thu, 9 Aug 2012 13:03:48 +0000 (09:03 -0400)]
Fix NPE in Dreams settings.
Handle the null case to avoid crashing Settings.
Change-Id: I257b766370bd604e0af5b332241619258fb732c9
Baligh Uddin [Thu, 9 Aug 2012 03:02:24 +0000 (20:02 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Tore Anderson [Wed, 8 Aug 2012 21:10:35 +0000 (23:10 +0200)]
Enable "APN roaming protocol" for all platforms
Allows users to change the protocol (the PDP context type) used when
roaming in the same way they already can for when they are in their home
network. This is required in order to make IPv6 and IPv4v6 data roaming
work correctly in 3GPP networks.
See also: http://code.google.com/p/android/issues/detail?id=32631
Change-Id: I052842122e5fe96a8779077f0ae9ff4bc83066c5
Signed-off-by: Tore Anderson <tore@fud.no>
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:06:31 +0000 (14:06 -0700)]
am
75266364: am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
7526636406087666d005d389ddc0cdacd79499fd':
Add support for SE Android to the Settings app.
Jean-Baptiste Queru [Wed, 8 Aug 2012 21:04:11 +0000 (14:04 -0700)]
am
5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '
5d72b2726797374e402943182d8132045ed32d3a':
Add support for SE Android to the Settings app.
Baligh Uddin [Wed, 8 Aug 2012 20:40:29 +0000 (13:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
Jean-Baptiste Queru [Wed, 8 Aug 2012 20:19:26 +0000 (13:19 -0700)]
Merge "Add support for SE Android to the Settings app."
Matthew Xie [Wed, 8 Aug 2012 07:33:38 +0000 (00:33 -0700)]
Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
The Android Open Source Project [Tue, 7 Aug 2012 22:14:14 +0000 (15:14 -0700)]
am
7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
7e107a0903707876c0ad7dd4ee2702fd5baed7ae':
The Android Open Source Project [Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
Baligh Uddin [Tue, 7 Aug 2012 21:54:01 +0000 (14:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 21:24:33 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d1d42585e5e2f0299a2a761089bb7984ca55531
Auto-generated-cl: translation import
The Android Automerger [Tue, 7 Aug 2012 20:01:34 +0000 (13:01 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Dianne Hackborn [Tue, 7 Aug 2012 18:49:14 +0000 (11:49 -0700)]
Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev
Dianne Hackborn [Tue, 7 Aug 2012 18:26:32 +0000 (11:26 -0700)]
Add dev setting to enable global actions bug report button.
Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4
Ganesh Ganapathi Batta [Tue, 31 Jul 2012 23:12:46 +0000 (16:12 -0700)]
Remove Profile Auto connection specific logic
Remove profile auto connection specific logic as it is not implemented in
Bluetooth app
Disconnect PBAP server connection when user initiates device level disconnection
Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4
Matthew Xie [Tue, 7 Aug 2012 05:48:41 +0000 (22:48 -0700)]
Merge "Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now, the DeviceProfileSettings screens displays valid 'Internet connection sharing' option when connected as a NAP to remote PANU." into jb-mr1-dev
Baligh Uddin [Tue, 7 Aug 2012 02:51:22 +0000 (19:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Romain Guy [Mon, 6 Aug 2012 21:52:52 +0000 (14:52 -0700)]
Add new dev settings to debug hardware layers
Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
Baligh Uddin [Mon, 6 Aug 2012 20:09:25 +0000 (13:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: If7727c84c1b71ef20c3f1fe4963ba0b27b3cb77c
Auto-generated-cl: translation import
OSDN Git Service
