Commit Graph

7603 Commits

Author SHA1 Message Date
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
Baligh Uddin
2e80628f74 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-06 19:51:22 -07:00
Romain Guy
cdc2c5534f Add new dev settings to debug hardware layers
Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
2012-08-06 14:52:52 -07:00
Baligh Uddin
59b52533ba Import translations. DO NOT MERGE
Change-Id: If7727c84c1b71ef20c3f1fe4963ba0b27b3cb77c
Auto-generated-cl: translation import
2012-08-06 13:09:25 -07:00
Ying Wang
0a83748580 am bdae7b01: (-s ours) am 3eee86b8: Import translations. DO NOT MERGE
* commit 'bdae7b013938030628577ef3ceb2b9954253c155':
  Import translations. DO NOT MERGE
2012-08-03 14:41:47 -07:00
Ying Wang
bdae7b0139 am 3eee86b8: Import translations. DO NOT MERGE
* commit '3eee86b8d7bc175e1e83269afc5c2c5441681a50':
  Import translations. DO NOT MERGE
2012-08-03 14:38:01 -07:00
Ying Wang
c868a4cae7 Import translations. DO NOT MERGE
Change-Id: I1de6f9c42101f6c984c79a75882d691692f17af5
Auto-generated-cl: translation import
2012-08-03 13:44:19 -07:00
Ying Wang
3eee86b8d7 Import translations. DO NOT MERGE
Change-Id: Ia673ddc20188c59c8591015e51033a526a7151ab
Auto-generated-cl: translation import
2012-08-03 13:41:54 -07:00
Przemyslaw Szczepaniak
104ab231e5 Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev 2012-08-03 09:17:36 -07:00
Przemyslaw Szczepaniak
e1d2b7fb78 Fixes list of TTS voices after changing voice data
Added one BroadcastListener that listens for TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED intents.
If it gets one, it will call TextToSpeech.Engine.ACTION_CHECK_TTS_DATA to update list of TTS voices.
It expects TTS engine to broadcast TTS_DATA_INSTALLED also when removing voice data.

In order to catch changes done when user sits in Text-to-speech output main activity,
TextToSpeech.Engine.ACTION_CHECK_TTS_DATA is called on start of tts engine config fragment.

Change-Id: Ic1e299ea3ffc45d938083f1ab5b2bf101fe25f26
2012-08-03 17:07:33 +01:00
John Spurlock
b54b45d93b Merge "Re-enable dreams: Settings" into jb-mr1-dev 2012-08-03 08:53:22 -07:00
Michael Jurka
6e380d0865 am 3d43f9c8: am ca511a81: Fix appwidget bind dialog
* commit '3d43f9c8aa2b00d894577e5b6dfe3ffcdfc9d871':
  Fix appwidget bind dialog
2012-08-02 22:31:34 -07:00
Michael Jurka
3d43f9c8aa am ca511a81: Fix appwidget bind dialog
* commit 'ca511a8115962be7f598deb20aa47793db6d06f7':
  Fix appwidget bind dialog
2012-08-02 22:29:23 -07:00
Michael Jurka
ca511a8115 Fix appwidget bind dialog
Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
2012-08-02 18:36:42 -07:00
John Spurlock
d541b6fd1c Re-enable dreams: Settings
Re-arrange settings and captions for dreams.  Activation on sleep
and activation on dock now independent. Sleep activation defaults to off,
dock activation defaults to on (replacing dock mode).

Also use dream manager service for testing dream preference, and properly
disable preferences if both dream activations are disabled.

Change-Id: I76f5ba115c7678826a09077dd393acc55c2bca26
Bug: 6921930
2012-08-02 16:49:23 -04:00
Syed Ibrahim M
6bce91bb9b 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.

Change-Id: I35821233e7776fb13f7fb1eb22af992b497202a9
2012-08-01 23:52:47 -07:00
Ying Wang
6a20ce5e51 am 91840c02: (-s ours) am d7ae05db: Import translations. DO NOT MERGE
* commit '91840c02361af8157b0c0395fafe704edab2e498':
  Import translations. DO NOT MERGE
2012-08-01 15:30:23 -07:00
Ying Wang
91840c0236 am d7ae05db: Import translations. DO NOT MERGE
* commit 'd7ae05dbdc1af637e7e6655abb1a6b63e9d49968':
  Import translations. DO NOT MERGE
2012-08-01 15:28:32 -07:00
Ying Wang
4c9e26b0d2 Import translations. DO NOT MERGE
Change-Id: I944d4e01e1453965b386dd8f49450fb2f7dd2d4e
Auto-generated-cl: translation import
2012-08-01 14:15:14 -07:00
Ying Wang
d7ae05dbdc Import translations. DO NOT MERGE
Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553
Auto-generated-cl: translation import
2012-08-01 14:13:16 -07:00
Ravi Nagarajan
c70f548355 Reset the priority on unbond
Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8
2012-08-01 00:25:24 -07:00