Wu, Hao
b76be1f8d4
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
2012-08-16 14:45:55 +08:00
Jeff Brown
3be4c81d36
am 62ff6791: am 0a5f02a7: Merge "Use new power manager API." into jb-mr1-dev
...
* commit '62ff679154f6249371c0add904febb369367c667':
Use new power manager API.
2012-08-15 10:33:05 -07:00
Brian Muramatsu
0bd54a65d6
display wireless charging status
...
- show "Charging (wireless)" when using wireless charger
- change "Discharging" to "Not charging"
bug: 6879638
Change-Id: I20e78f2bde7a526667510b82a030f5952d9dda75
2012-08-14 15:30:22 -07:00
Jeff Brown
748ba16a04
Use new power manager API.
...
Change-Id: If0c58a9bee05ec0de434879e78cd95299e54e3fe
2012-08-14 14:38:12 -07:00
Jean-Baptiste Queru
1b4a1b0903
am f07797d8: am b1f96237: am 291389ed: am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"
...
* commit 'f07797d858abc701cce541f2a66761123b21b554':
Fix use of holo drawables in a few more places
2012-08-14 08:45:09 -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
178eba477d
am 72529f17: am ccd80ec9: Fix for setting TTS language to recently downloaded one
...
* commit '72529f179b6ba1c0f0430f31d97dd4fedbbfbb11':
Fix for setting TTS language to recently downloaded one
2012-08-14 08:33:56 -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
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
ceb001a728
am adfa7fb2: am 1c7d15e8: am 865a914f: am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
...
* commit 'adfa7fb2a70f459de53a72b3c3ace9aee0a781c6':
Fix the issue the setting crashes after unmount SD card in landscape
2012-08-13 16:10:26 -07:00
Jeff Sharkey
a63549ddce
am 03bec5dc: am d47a0d6c: am 677e2ff6: am d7db6baa: Merge "Don\'t direct to market if no markets installed"
...
* commit '03bec5dc1e1f236c33728ddc4ca42737c0a44f78':
Don't direct to market if no markets installed
2012-08-13 16:10:24 -07:00
Jean-Baptiste Queru
c3b7086802
am 463b501e: am 9e8e9a17: am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"
...
* commit '463b501e6c50fb2312e83b520147af41b253dd8f':
Settings: Use ICS alert drawable
2012-08-13 16:10:23 -07: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
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
bdc19f33cb
am 032aa5a5: am 32630395: Use UserManager instead of PackageManager for user management
...
* commit '032aa5a5ba22a5c46adc0fda210689c25e0e2bb5':
Use UserManager instead of PackageManager for user management
2012-08-11 21:59:11 -07: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
Przemyslaw Szczepaniak
7edae431ee
am 06649d02: am 923187a1: Keep speech rate dialog after rotate
...
* commit '06649d02b2d6e3f147a1082c7538682f97e64a0b':
Keep speech rate dialog after rotate
2012-08-10 07:18:23 -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
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
79a0554444
am 6a88ef4b: am aae0659e: Setting to turn off power optimizations
...
* commit '6a88ef4bd233591cfdd3cfa5cee9af61483242eb':
Setting to turn off power optimizations
2012-08-09 16:06:33 -07:00
Irfan Sheriff
aae0659e18
Setting to turn off power optimizations
...
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
2012-08-09 15:16:07 -07:00
John Spurlock
fc470e4db7
am aeb7b571: am eaffad37: Merge "Fix NPE in Dreams settings." into jb-mr1-dev
...
* commit 'aeb7b5710593b982d2306eb2006b6ae153655141':
Fix NPE in Dreams settings.
2012-08-09 06:22:56 -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
Jean-Baptiste Queru
9b46e9a231
am 17d915b7: am 66321184: am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
...
* commit '17d915b7fdc4527710022ed3dd6c48bc03b8157b':
Add support for SE Android to the Settings app.
2012-08-08 15:11:26 -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
Matthew Xie
4b6c57c74b
am 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
...
* commit '83457dd79bb481afe9a1ad16259802b0a09fe68a':
Remove Profile Auto connection specific logic
2012-08-08 00:37:48 -07:00
Matthew Xie
a1f463cb19
Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
2012-08-08 00:33:38 -07:00
Dianne Hackborn
4f7a133f36
am eb657dc8: am f621435e: Merge "Add dev setting to enable global actions bug report button." into jb-mr1-dev
...
* commit 'eb657dc8eb8f6bb990b8dd974dd92844106f2572':
Add dev setting to enable global actions bug report button.
2012-08-07 11:52:56 -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
b0280b7dfc
am 8756c500: am 9effd146: 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 i
...
* commit '8756c500a1aa22b9b81eeeb7f25ec7246a1c1464':
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.
2012-08-06 22:52: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
Romain Guy
0c51012c86
am d542deb4: am cdc2c553: Add new dev settings to debug hardware layers
...
* commit 'd542deb40e40d1af995b0757b86dd23402256e63':
Add new dev settings to debug hardware layers
2012-08-06 14:57:54 -07:00
Romain Guy
cdc2c5534f
Add new dev settings to debug hardware layers
...
Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
2012-08-06 14:52:52 -07:00
Przemyslaw Szczepaniak
08c147392b
am 31eab697: am 104ab231: Merge "Fixes list of TTS voices after changing voice data" into jb-mr1-dev
...
* commit '31eab6973c5472475677532d0b4d63cacb64a656':
Fixes list of TTS voices after changing voice data
2012-08-03 09:21:56 -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