Dianne Hackborn
d44b53e37a
Merge "Make manage apps UI multi-user aware." into jb-mr1-dev
2012-08-21 11:19:17 -07:00
Dianne Hackborn
271c8b06c2
Make manage apps UI multi-user aware.
...
The details screens still need some work.
Change-Id: I850cc9ba9a8db7787fae629ae3cb6c6772c726f5
2012-08-21 11:14:04 -07:00
Jake Hamby
0141872d29
am 0de311b4: am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
...
* commit '0de311b4956acc6ec05d25707f1075c1b8a38280':
Enable "APN roaming protocol" for all platforms
2012-08-20 18:08:02 -07:00
Jake Hamby
0de311b495
am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
...
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e':
Enable "APN roaming protocol" for all platforms
2012-08-20 18:06:25 -07:00
Jake Hamby
c46455ac7a
Merge "Enable "APN roaming protocol" for all platforms"
2012-08-20 17:27:36 -07:00
Brian Muramatsu
e54660d8b6
Merge "display wireless charging status" into jb-mr1-dev
2012-08-20 16:58:31 -07:00
Jean-Baptiste Queru
b40815c150
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.
2012-08-17 08:57:04 -07:00
Jean-Baptiste Queru
43231f2d6e
am f4cc034e: am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
...
* commit 'f4cc034e8c61a05b3e99ca4f698b3fe6de21bc98':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:57:03 -07:00
Jean-Baptiste Queru
71742eb132
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.
2012-08-17 08:55:52 -07:00
Jean-Baptiste Queru
f4cc034e8c
am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
...
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:55:51 -07:00
Jean-Baptiste Queru
0c869d694b
Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
2012-08-17 08:51:18 -07:00
Dianne Hackborn
bb06a427eb
Rename UserId to UserHandle.
...
Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
2012-08-16 12:47:09 -07:00
Li Wenji
83397eab96
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
2012-08-16 14:47:43 +08:00
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
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
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
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
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
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
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
Irfan Sheriff
aae0659e18
Setting to turn off power optimizations
...
Bug: 5885175
Change-Id: I55bfabdffea95d151af6bb4d9da9137124bcb763
2012-08-09 15:16:07 -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
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
a1f463cb19
Merge "Remove Profile Auto connection specific logic" into jb-mr1-dev
2012-08-08 00:33:38 -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
Romain Guy
cdc2c5534f
Add new dev settings to debug hardware layers
...
Change-Id: I2668552d70911a90e173efdf75bc44139ed394c8
2012-08-06 14:52:52 -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