Commit Graph

7623 Commits

Author SHA1 Message Date
Baligh Uddin
05e1651539 am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'cb5624b80673e74f26d052f792dc8c9ce6e09a95':
  Import translations. DO NOT MERGE
2012-08-14 13:09:11 -07:00
Baligh Uddin
cb5624b806 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-08-14 13:05:19 -07:00
Baligh Uddin
30e671bfc9 am 133c8ca5: (-s ours) am c5acc132: Import translations. DO NOT MERGE
* commit '133c8ca599315c60bc8b30a4ac2020ceee02fc8e':
  Import translations. DO NOT MERGE
2012-08-14 12:56:06 -07:00
Baligh Uddin
133c8ca599 am c5acc132: Import translations. DO NOT MERGE
* commit 'c5acc132ca3de71c36cca1ebea2635396172ab4a':
  Import translations. DO NOT MERGE
2012-08-14 12:55:11 -07:00
Baligh Uddin
d97aad10be Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-14 12:49:35 -07:00
Baligh Uddin
4e29964428 Import translations. DO NOT MERGE
Change-Id: I6675ea178a94e2a8b185f3cc5900e96de4f61c3d
Auto-generated-cl: translation import
2012-08-14 12:48:45 -07:00
Baligh Uddin
c5acc132ca Import translations. DO NOT MERGE
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
2012-08-14 12:45:33 -07:00
Jean-Baptiste Queru
b1f962377e 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
2012-08-14 08:41:17 -07:00
Jean-Baptiste Queru
291389ed5c 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
2012-08-14 08:39:24 -07:00
Przemyslaw Szczepaniak
ccd80ec95f 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
2012-08-14 08:29:05 -07:00
Jean-Baptiste Queru
5dbc1f6405 Merge "Fix use of holo drawables in a few more places" 2012-08-14 08:19:21 -07:00
Björn Lundén
c8272b0752 Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
2012-08-14 01:25:21 +02:00
Jeff Sharkey
1c7d15e841 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
2012-08-13 16:03:23 -07:00
Jeff Sharkey
d47a0d6c51 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
2012-08-13 16:03:22 -07:00
Jean-Baptiste Queru
9e8e9a1783 am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit '6fb425e2805a1c27c048fc954d402f4612cbf74d':
  Settings: Use ICS alert drawable
2012-08-13 16:03:15 -07:00
Jeff Sharkey
865a914fb5 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
2012-08-13 14:11:01 -07:00
Jeff Sharkey
677e2ff670 am d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit 'd7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
  Don't direct to market if no markets installed
2012-08-13 14:11:00 -07:00
Baligh Uddin
70372dcfc3 Import translations. DO NOT MERGE
Change-Id: I98801e0b6cf3096a394a367ed93b49a2f7f851dc
Auto-generated-cl: translation import
2012-08-13 13:27:25 -07:00
Baligh Uddin
059b123cb9 Import translations. DO NOT MERGE
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
2012-08-13 13:24:26 -07:00
Jeff Sharkey
42eb3fb258 Merge "Fix the issue the setting crashes after unmount SD card in landscape" 2012-08-13 13:17:12 -07:00
Jeff Sharkey
d7db6baac7 Merge "Don't direct to market if no markets installed" 2012-08-13 13:14:08 -07:00
Jean-Baptiste Queru
6fb425e280 am eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit 'eefa61ed2e8583f659e868f3057f195d7cb2bb11':
  Settings: Use ICS alert drawable
2012-08-13 12:02:26 -07:00
Jean-Baptiste Queru
eefa61ed2e Merge "Settings: Use ICS alert drawable" 2012-08-13 11:53:46 -07:00
Jack Wang
481582f4ec Fix memory leak in ApnSettings-activity
When destroying the activity, the HandlerThread isnt stopped. This
results in that the thread remains, and if you enter/exit the
activity multiple times, you will end up with multiple threads and
a small memory leak

Change-Id: I4779d2625e6002b55066dd034c84d743b9f80ef5
2012-08-13 15:25:04 +02:00
Amith Yamasani
32630395eb Use UserManager instead of PackageManager for user management
Show Accounts in secondary settings
Move Users & restrictions to Device section

Change-Id: Idcd7ed44801fe92c847cff81d11f3d6f6d06ba81
2012-08-10 19:53:29 -07:00
Baligh Uddin
5ef3293ed2 Import translations. DO NOT MERGE
Change-Id: Ifc7f0f0796b3cd9b46dc913083ea38c146feb086
Auto-generated-cl: translation import
2012-08-10 11:21:05 -07:00
Przemyslaw Szczepaniak
923187a159 Keep speech rate dialog after rotate
It also adds some missing @Override

Bug: 5997716
Change-Id: I33a7b8ad16cd067af960a4808ae6003dde1d7693
2012-08-10 07:13:52 -07:00
Baligh Uddin
658f909d71 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-09 19:50:14 -07:00
Chuanxiao Dong
66e7f0a393 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
2012-08-10 10:49:45 +08:00
Li Gang
8218d3ba18 MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled,
disable the erasing and umount operation.
Judge SD card Mounting status and keep summary string.

Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7
Author: Li Gang <gang.g.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: 47043
2012-08-10 10:20:48 +08:00
Irfan Sheriff
aae0659e18 Setting to turn off power optimizations
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
2012-08-09 15:16:07 -07:00
Baligh Uddin
0ad6982813 Import translations. DO NOT MERGE
Change-Id: Iae1a278483147ad7497d207856bb9cf6a56a0bb1
Auto-generated-cl: translation import
2012-08-09 12:39:18 -07:00
John Spurlock
eaffad37c1 Merge "Fix NPE in Dreams settings." into jb-mr1-dev 2012-08-09 06:18:45 -07:00
John Spurlock
7a99b21a4b Fix NPE in Dreams settings.
Handle the null case to avoid crashing Settings.

Change-Id: I257b766370bd604e0af5b332241619258fb732c9
2012-08-09 09:03:48 -04:00
Baligh Uddin
702cdf4c9a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:02:24 -07:00
Tore Anderson
68b9a26543 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>
2012-08-08 23:10:35 +02:00
Jean-Baptiste Queru
6632118457 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.
2012-08-08 14:06:31 -07:00
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
2012-08-08 14:04:11 -07:00
Baligh Uddin
24fb893381 Import translations. DO NOT MERGE
Change-Id: I7a08f18c8f4ed45612e5491aa2b0ba2812373013
Auto-generated-cl: translation import
2012-08-08 13:40:29 -07:00
Jean-Baptiste Queru
5d72b27267 Merge "Add support for SE Android to the Settings app." 2012-08-08 13:19:26 -07:00
Matthew Xie
a1f463cb19 Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev 2012-08-08 00:33:38 -07:00
The Android Open Source Project
4325cf22ef am 7e107a09: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '7e107a0903707876c0ad7dd4ee2702fd5baed7ae':
2012-08-07 15:14:14 -07:00
The Android Open Source Project
7e107a0903 Reconcile with jb-mr0-release - do not merge
Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5
2012-08-07 14:59:46 -07:00
Baligh Uddin
6ac8bae6a9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-07 14:54:02 -07:00
Baligh Uddin
7eac4706a8 Import translations. DO NOT MERGE
Change-Id: I9d1d42585e5e2f0299a2a761089bb7984ca55531
Auto-generated-cl: translation import
2012-08-07 14:24:33 -07:00
The Android Automerger
9a85ed20ee merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:34 -07:00
Dianne Hackborn
f621435eaf Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev 2012-08-07 11:49:15 -07:00
Dianne Hackborn
2d803a3931 Add dev setting to enable global actions bug report button.
Change-Id: I3768f95e1c6fbec9c10186093e5e1d48b0ef6ae4
2012-08-07 11:26:32 -07:00
Ganesh Ganapathi Batta
0654b71534 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
2012-08-06 23:27:27 -07:00
Matthew Xie
9effd14611 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 2012-08-06 22:48:41 -07:00