OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoam 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from...
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:15:22 +0000 (11:15 -0700)]
am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."

* commit '300457bad289f547430da21e72747e8840840832':
  Enable to delete a stored persistent group from p2p settings.

11 years agoam 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
Jean-Baptiste Queru [Tue, 28 Aug 2012 18:10:06 +0000 (11:10 -0700)]
am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."

* commit '38ce5194e89b83697466abe2994016507109ec54':
  Enable to delete a stored persistent group from p2p settings.

11 years agoMerge "Enable to delete a stored persistent group from p2p settings."
Jean-Baptiste Queru [Tue, 28 Aug 2012 17:46:59 +0000 (10:46 -0700)]
Merge "Enable to delete a stored persistent group from p2p settings."

11 years agoEnable to delete a stored persistent group from p2p settings.
Yoshihiko Ikenaga [Mon, 27 Aug 2012 13:10:05 +0000 (22:10 +0900)]
Enable to delete a stored persistent group from p2p settings.

Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.

Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 27 Aug 2012 23:03:30 +0000 (16:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 27 Aug 2012 22:08:09 +0000 (15:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import

11 years agoMerge "Always-on VPN." into jb-mr1-dev
Jeff Sharkey [Mon, 27 Aug 2012 20:58:02 +0000 (13:58 -0700)]
Merge "Always-on VPN." into jb-mr1-dev

11 years agoAlways-on VPN.
Jeff Sharkey [Sat, 25 Aug 2012 07:06:08 +0000 (00:06 -0700)]
Always-on VPN.

Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS.  Moved "add" operation into action bar.

Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe

11 years agoMerge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
Amith Yamasani [Sun, 26 Aug 2012 05:09:53 +0000 (22:09 -0700)]
Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev

11 years agoMerge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
Amith Yamasani [Sun, 26 Aug 2012 04:52:38 +0000 (21:52 -0700)]
Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev

11 years agoSettings: Fix crash seen when setting the radio band
Jeevaka Badrappan [Fri, 1 Jun 2012 07:57:31 +0000 (10:57 +0300)]
Settings: Fix crash seen when setting the radio band

When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.

Check the activity status before displaying the
set radio band result alert dialog.

Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
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: 39317

11 years agoam 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio...
Amith Yamasani [Sat, 25 Aug 2012 19:58:18 +0000 (12:58 -0700)]
am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"

* commit '41446512cfa6e009187b7cc67fa34a29f82ddccc':
  Settings: Fix crash seen when setting the radio band

11 years agoam 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
Amith Yamasani [Sat, 25 Aug 2012 19:56:23 +0000 (12:56 -0700)]
am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"

* commit '52d996edeb7958d386bbf6655e9acfec3b10fdf2':
  Settings: Fix crash seen when setting the radio band

11 years agoMerge "Settings: Fix crash seen when setting the radio band"
Amith Yamasani [Sat, 25 Aug 2012 18:55:41 +0000 (11:55 -0700)]
Merge "Settings: Fix crash seen when setting the radio band"

11 years agoAvoid re-creating a user when activity is resumed
Amith Yamasani [Sat, 25 Aug 2012 14:47:43 +0000 (07:47 -0700)]
Avoid re-creating a user when activity is resumed

onCreate() was getting called again, resulting in another user being
created. Keeping the new userid across pause/resume.

Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Fri, 24 Aug 2012 22:03:15 +0000 (15:03 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 24 Aug 2012 20:29:14 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import

11 years agoMake settings a little aware of multi-user install.
Dianne Hackborn [Fri, 24 Aug 2012 01:44:31 +0000 (18:44 -0700)]
Make settings a little aware of multi-user install.

Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa

11 years agoMerge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
Jeff Sharkey [Fri, 24 Aug 2012 18:33:02 +0000 (11:33 -0700)]
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev

11 years agoMigrate legacy VPN arguments to system_server.
Jeff Sharkey [Fri, 24 Aug 2012 18:17:49 +0000 (11:17 -0700)]
Migrate legacy VPN arguments to system_server.

Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.

Bug: 5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7

11 years agoam 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD...
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:29:43 +0000 (07:29 -0700)]
am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '88f379367f208a75dfe95a081b25c27a54b06a1a':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 24 Aug 2012 01:11:17 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import

11 years agoMerge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
Amith Yamasani [Thu, 23 Aug 2012 18:28:06 +0000 (11:28 -0700)]
Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev

11 years agoShow the license dialog only if the activity is still showing
Amith Yamasani [Thu, 23 Aug 2012 18:25:18 +0000 (11:25 -0700)]
Show the license dialog only if the activity is still showing

Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a

11 years agoMerge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
John Spurlock [Thu, 23 Aug 2012 17:47:15 +0000 (10:47 -0700)]
Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev

11 years agoam 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while...
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:47:04 +0000 (09:47 -0700)]
am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '1183f487c8ea8660415fcd30914844e8dc2de2bb':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active

11 years agoMerge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
Jean-Baptiste Queru [Thu, 23 Aug 2012 16:31:35 +0000 (09:31 -0700)]
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

11 years agoSettings: Minimal refactor to support new dreams api.
John Spurlock [Wed, 22 Aug 2012 13:59:44 +0000 (09:59 -0400)]
Settings: Minimal refactor to support new dreams api.

Fix breaking changes to the dreams api.  Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.

Bug:7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 23 Aug 2012 02:39:04 +0000 (19:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoMerge "Simplify User management settings to bare minimum" 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

11 years agoSimplify User management settings to bare minimum
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

11 years agoMerge "Simplify proxy regex" into jb-mr1-dev
Irfan Sheriff [Wed, 22 Aug 2012 21:21:41 +0000 (14:21 -0700)]
Merge "Simplify proxy regex" into jb-mr1-dev

11 years agoSimplify proxy regex
Irfan Sheriff [Wed, 22 Aug 2012 21:19:52 +0000 (14:19 -0700)]
Simplify proxy regex

Bug: 6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d

11 years agoImport translations. DO NOT MERGE
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

11 years agoMerge "Update view on UI thread" into jb-mr1-dev
Irfan Sheriff [Wed, 22 Aug 2012 18:57:18 +0000 (11:57 -0700)]
Merge "Update view on UI thread" into jb-mr1-dev

11 years agoUpdate view on UI thread
Irfan Sheriff [Wed, 22 Aug 2012 18:36:01 +0000 (11:36 -0700)]
Update view on UI thread

Bug: 6970872
Change-Id: I05bec7cb8a8292de522cbfe11c0ecd5a79375014

11 years agoMerge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
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

11 years agoAdd a flag to control auto-brightness adjustment.
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

11 years agoam 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is...
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

11 years agoam 578700af: Merge "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

11 years agoMerge "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"

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 21 Aug 2012 18:57:11 +0000 (11:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
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

11 years agoMerge "Make manage apps UI multi-user aware." into jb-mr1-dev
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

11 years agoMake manage apps UI multi-user aware.
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

11 years agoSettings: disable Lock SIM card till response is received
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

11 years agoam 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
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

11 years agoam c46455ac: Merge "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

11 years agoMerge "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"

11 years agoMerge "display wireless charging status" into jb-mr1-dev
Brian Muramatsu [Mon, 20 Aug 2012 23:58:30 +0000 (16:58 -0700)]
Merge "display wireless charging status" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoam 71742eb1: am 0c869d69: Merge "UsbSetting: The behavior is not right when enable...
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.

11 years agoam f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked...
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

11 years agoam 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP...
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.

11 years agoam d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tetheri...
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

11 years agoMerge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accesso...
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."

11 years agoMerge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
Jean-Baptiste Queru [Fri, 17 Aug 2012 15:51:14 +0000 (08:51 -0700)]
Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"

11 years agoSettings: Fix crash seen when setting the radio band
Jeevaka Badrappan [Fri, 1 Jun 2012 07:57:31 +0000 (10:57 +0300)]
Settings: Fix crash seen when setting the radio band

When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.

Check the activity status before displaying the
set radio band result alert dialog.

Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
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: 39317

11 years agoam 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge
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':

11 years agoReconcile with jb-mr0-release - do not merge
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

11 years agomerge in jb-mr0-release history after reset to jb-dev
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 16 Aug 2012 22:01:28 +0000 (15:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
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

11 years agoRename UserId to UserHandle.
Dianne Hackborn [Thu, 16 Aug 2012 18:01:57 +0000 (11:01 -0700)]
Rename UserId to UserHandle.

Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f

11 years agoTetheringSetting: Keep Tethering checkbox unchecked until tethering up
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

11 years agoUsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory...
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoMerge "Use new power manager API." into jb-mr1-dev
Jeff Brown [Wed, 15 Aug 2012 17:27:01 +0000 (10:27 -0700)]
Merge "Use new power manager API." into jb-mr1-dev

11 years agoam 8ddcdbd4: (-s ours) am 11665038: Merge "Import translations. DO NOT MERGE" into...
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

11 years agoam 11665038: Merge "Import translations. DO NOT MERGE" into jb-dev
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Wed, 15 Aug 2012 14:54:44 +0000 (07:54 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 15 Aug 2012 14:48:35 +0000 (07:48 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agodisplay wireless charging status
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

11 years agoUse new power manager API.
Jeff Brown [Sat, 11 Aug 2012 00:25:19 +0000 (17:25 -0700)]
Use new power manager API.

Change-Id: If0c58a9bee05ec0de434879e78cd95299e54e3fe

11 years agoam 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into...
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

11 years agoam cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-dev
Baligh Uddin [Tue, 14 Aug 2012 20:05:18 +0000 (13:05 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev

11 years agoam 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGE
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

11 years agoam c5acc132: 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

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Tue, 14 Aug 2012 19:49:34 +0000 (12:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoam 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"
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

11 years agoam 5dbc1f64: Merge "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

11 years agoFix for setting TTS language to recently downloaded one
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

11 years agoMerge "Fix use of holo drawables in a few more places"
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"

11 years agoFix 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

11 years agoam 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount...
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

11 years agoam 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed"
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

11 years agoam 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"
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

11 years agoam 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
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

11 years agoam d7db6baa: Merge "Don\'t direct to market if no markets installed"
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoImport translations. DO NOT MERGE
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

11 years agoMerge "Fix the issue the setting crashes after unmount SD card in landscape"
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"

11 years agoMerge "Don't direct to market if no markets installed"
Jeff Sharkey [Mon, 13 Aug 2012 20:14:08 +0000 (13:14 -0700)]
Merge "Don't direct to market if no markets installed"

11 years agoam eefa61ed: Merge "Settings: Use ICS alert drawable"
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