Chris Wren
cdd9d033b0
Allow users to change the length of BT disoverability. DO NOT MERGE
...
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug 2413429:
http://b/issue?id=2413429
and external issue 6348:
http://code.google.com/p/android/issues/detail?id=6348
Original Author: Chris Wren <crwen@google.com >
Modifications done by: Jaikumar Ganesh<jaikumar@google.com >
Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
2011-05-27 10:27:14 -07:00
Eric Fischer
7c284c2c62
Import revised translations. DO NOT MERGE
...
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
2011-04-27 13:53:57 -07:00
Simon Wilson
37063d6adf
DO NOT MERGE Clarify additional system update string length/usage
...
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
2011-04-11 12:38:54 -07:00
Eric Fischer
fcb089c942
Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
2011-04-01 16:52:28 -07:00
Simon Wilson
ca572fb64b
Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
2011-04-01 16:47:22 -07:00
Eric Fischer
3ac5c8cfd2
Reimport Settings translations. DO NOT MERGE
...
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
2011-04-01 16:42:38 -07:00
Eric Fischer
b4bd78f523
Revert "Import revised translations. DO NOT MERGE"
...
This reverts commit 955ab98f03
.
Bug 4204088 requires that these strings not be translated.
Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
2011-04-01 16:13:11 -07:00
Simon Wilson
5014f281d7
DO NOT MERGE Put additional update package names in config.xml
...
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.
Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
2011-04-01 13:59:32 -07:00
Eric Fischer
955ab98f03
Import revised translations. DO NOT MERGE
...
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
2011-03-29 10:58:24 -07:00
Park Sanghyun
e5da8565ca
DO NOT MERGE Add support for additional System Update menu item
...
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
2011-03-25 19:18:01 -07:00
Eric Fischer
c4eeeb29c5
Import revised translations. DO NOT MERGE
...
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
2011-03-18 15:17:01 -07:00
TK MUN
e0e845fee6
DO NOT MERGE Do not allow shortcut for "4G Settings"
...
Settings shortcuts are only for the modules inside the settings
application. The pathclassloader is /system/app/Settings.apk for
all the settings shortcuts. Since 4G settings is outside of
Settings.apk, we cannot support a shortcut for this.
Change-Id: I1b5523618ef5e8eea8535793f3a983e6ba21d551
2011-03-16 18:10:28 -07:00
Mike Lockwood
e6c7e45fdb
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
...
Bug: 4061035
Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-03-11 19:19:27 -05:00
TK MUN
36469186b7
DO NOT MERGE WiMAX settings menu
...
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.
Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099
Signed-off-by: TK MUN <tk.mun@samsung.com >
2011-03-09 23:02:21 -08:00
Lorenzo Colitti
f4393101f8
Merge "Support configuring the protocol in APN settings." into gingerbread
2011-03-03 17:03:45 -08:00
Mike Lockwood
0552d33664
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
...
The USB service caches the preferred activity preferences for USB devices
and accessories and allows permission to access the hardware based on the
user's selection. The "Clear defaults" button can now be used to clear
these settings.
Change-Id: If865df98214506cf2f1e35c8c6a3dbe319b125f2
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-03-02 00:00:09 -08:00
Lorenzo Colitti
a52c5698ca
Support configuring the protocol in APN settings.
...
Bug: 3333633
Change-Id: I0797cd97074fe1b8a1318168b86fe4627488215a
2011-02-22 01:42:32 -08:00
Eric Fischer
bd0448185f
Import revised translations. DO NOT MERGE
...
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
2011-02-14 17:25:07 -08:00
Amith Yamasani
aae04e43ec
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
...
Bug: 3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
2011-02-10 17:19:11 -08:00
Eric Fischer
47d2ecd0c4
Import revised translations. DO NOT MERGE
...
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-07 13:38:01 -08:00
Eric Fischer
93580e222c
Import revised translations. DO NOT MERGE
...
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
2011-01-31 12:25:49 -08:00
Eric Fischer
5a2bb8c0dc
Import revised translations. DO NOT MERGE
...
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
2011-01-28 13:21:54 -08:00
Eric Fischer
95112e5b98
Import revised translations. DO NOT MERGE
...
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
2011-01-27 14:04:11 -08:00
Eric Fischer
6418d37367
Import translations for additional languages.
...
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
2011-01-06 10:39:31 -08:00
Nick Pelly
c1286804cc
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
2010-12-10 17:18:54 -08:00
Nick Pelly
267419ff8b
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
...
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
2010-12-09 19:39:58 -08:00
Eric Fischer
99d2471d8d
Import revised translations. DO NOT MERGE
...
Bug 3272618
Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
2010-12-09 16:57:40 -08:00
Jean-Baptiste Queru
2a7c542594
reconcile with open-source gingerbread
...
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
2010-12-09 10:18:44 -08:00
Jake Hamby
c681e939dd
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
...
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug: 3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
2010-12-09 07:50:04 -08:00
Jake Hamby
b0fda6f56a
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
...
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug: 3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
2010-12-03 17:24:21 -08:00
Irfan Sheriff
fa04d89fd8
avoid view creation on orientation change
...
Bug: 3238075
Change-Id: Ia245e701b9663a1a8eb0457b8a181a7899e8d6c5
2010-12-01 15:07:02 -08:00
Eric Fischer
e1e257f4b4
Import revised translations. DO NOT MERGE
...
Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f
2010-11-29 16:21:55 -08:00
Eric Fischer
5c20526246
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-11-11 15:43:19 -08:00
Dianne Hackborn
83d2698f4f
Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
2010-11-10 17:58:58 -08:00
Eric Fischer
c885743699
Import revised translations. DO NOT MERGE
...
Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b
2010-11-09 12:19:25 -08:00
Dianne Hackborn
21023464b2
Fix issue #3177284 : Account for wake lock power usage on Crespo
...
Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
2010-11-08 19:05:00 -08:00
Nick Pelly
91ba0709b0
Update settings text on success, so we clear out error text after recovery.
...
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com >
2010-11-03 21:56:36 -05:00
Dianne Hackborn
4e4ed14ee2
Fix issue #3146784 : ANR in manage applications
...
See the big comment.
Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
2010-10-29 13:58:49 -07:00
Eric Fischer
873a27c399
Import revised translations. DO NOT MERGE
...
Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72
2010-10-25 15:46:11 -07:00
Eric Fischer
901f4fbe29
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-22 16:01:29 -07:00
Eric Fischer
e6d4ba594c
Import revised translations. DO NOT MERGE
...
Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e
2010-10-22 15:31:13 -07:00
Dianne Hackborn
5e34f23986
Fix issue #3124528 : Mange applications is including cache files in storage size
...
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
2010-10-22 12:18:16 -07:00
Eric Fischer
a640fb4f97
Fix the build. A "--" token is not just text in an XML comment.
...
Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380
2010-10-21 18:15:34 -07:00
Roy West
6982752436
Try to fix bug3119318 without breaking the build this time
...
Change-Id: Ic89675546f3ab72588ce18fbe7740749da6f870c
2010-10-21 17:42:44 -07:00
Mathias Agopian
9f869d1198
Revert "Fix bug3119318, missing Mount USB storage strings"
...
This reverts commit af06d7a94a
.
2010-10-21 16:37:59 -07:00
Roy West
af06d7a94a
Fix bug3119318, missing Mount USB storage strings
...
Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d
2010-10-21 15:47:14 -07:00
Nick Pelly
781c0aa21e
Merge "NFC Settings cleanup." into gingerbread
2010-10-21 03:56:18 -07:00
Nick Pelly
e16f78d54a
NFC Settings cleanup.
...
NFC service now tracks its own settings. Call the NFC API to determine
state.
Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-20 18:42:23 -07:00
Dianne Hackborn
7a51995581
Merge "Fix issue #3114356 : Storage visualization in Manage Apps is confusing" into gingerbread
2010-10-20 16:58:47 -07:00
Dianne Hackborn
d2be882d8f
Fix issue #3114356 : Storage visualization in Manage Apps is confusing
...
Also fixes issue #3097388 : If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached
Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
2010-10-20 16:54:41 -07:00