Commit Graph

2044 Commits

Author SHA1 Message Date
The Android Automerger
c538eece94 merge in gingerbread-release history after reset to gingerbread 2011-03-14 22:34:00 -07:00
The Android Automerger
074adca729 merge in gingerbread-release history after reset to gingerbread 2011-03-12 11:56:24 -08: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
The Android Automerger
39544fce59 merge in gingerbread-release history after reset to gingerbread 2011-03-11 10:35:43 -08: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
The Android Automerger
8d36266ffe merge in gingerbread-release history after reset to gingerbread 2011-03-09 08:54:05 -08:00
The Android Automerger
5f82f5ac4d merge in gingerbread-release history after reset to gingerbread 2011-03-07 16:40:15 -08:00
The Android Automerger
baf30bf67c merge in gingerbread-release history after reset to gingerbread 2011-03-04 21:56:46 -08:00
The Android Automerger
c1bd1f15a9 merge in gingerbread-release history after reset to gingerbread 2011-03-04 17:42:03 -08:00
Lorenzo Colitti
f4393101f8 Merge "Support configuring the protocol in APN settings." into gingerbread 2011-03-03 17:03:45 -08:00
The Android Automerger
deb4ca695b merge in gingerbread-release history after reset to gingerbread 2011-03-03 14:17:47 -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
aba8cc88cc Import revised translations. DO NOT MERGE
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
2011-02-18 08:00:07 -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
0ca84e108e Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-08 14:20:12 -08:00
Eric Fischer
47d2ecd0c4 Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-07 13:38:01 -08:00
The Android Automerger
7758683af0 merge in gingerbread-release history after reset to gingerbread 2011-02-03 14:24:07 -08:00
The Android Automerger
e90eb5e2a3 merge in gingerbread-release history after reset to gingerbread 2011-02-02 18:29:38 -08:00
The Android Automerger
a133b1b0c5 merge in gingerbread-release history after reset to gingerbread 2011-02-02 17:45:09 -08:00
Eric Fischer
93580e222c Import revised translations. DO NOT MERGE
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
2011-01-31 12:25:49 -08:00
The Android Automerger
785b409d0d merge in gingerbread-release history after reset to gingerbread 2011-01-30 16:03:20 -08:00
The Android Automerger
83bc7d643b merge in gingerbread-release history after reset to gingerbread 2011-01-28 14:45:14 -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
The Android Automerger
517973f71c merge in gingerbread-release history after reset to gingerbread 2011-01-26 18:55:33 -08:00
The Android Automerger
edb4ea1304 merge in gingerbread-release history after reset to gingerbread 2011-01-26 15:13:05 -08:00
The Android Automerger
36b4144dc7 merge in gingerbread-release history after reset to gingerbread 2011-01-20 17:20:59 -08:00
The Android Automerger
f30cccb88c merge in gingerbread-release history after reset to gingerbread 2011-01-16 16:22:06 -08:00
The Android Automerger
de1ea09404 merge in gingerbread-release history after reset to gingerbread 2011-01-16 08:53:48 -08:00
The Android Automerger
d7aae5c729 merge in gingerbread-release history after reset to gingerbread 2011-01-14 07:48:54 -08:00
The Android Automerger
da51690194 merge in gingerbread-release history after reset to gingerbread 2011-01-13 07:48:21 -08:00
The Android Automerger
5868b837ec merge in gingerbread-release history after reset to gingerbread 2011-01-12 07:21:03 -08:00
The Android Automerger
247a2a8d38 merge in gingerbread-release history after reset to gingerbread 2011-01-11 07:34:51 -08:00
The Android Automerger
9816904602 merge in gingerbread-release history after reset to gingerbread 2011-01-10 07:39:54 -08:00
The Android Automerger
143bcfaabf merge in gingerbread-release history after reset to gingerbread 2011-01-06 17:24:27 -08:00
Eric Fischer
6418d37367 Import translations for additional languages.
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
2011-01-06 10:39:31 -08:00
The Android Automerger
ffe211d69f merge in gingerbread-release history after reset to gingerbread 2011-01-05 07:33:59 -08:00
The Android Automerger
7e346477d8 merge in gingerbread-release history after reset to gingerbread 2011-01-04 07:19:45 -08:00
The Android Automerger
6ab2fa9009 merge in gingerbread-release history after reset to gingerbread 2010-12-22 08:00:45 -08:00
The Android Automerger
4343f314ec merge in gingerbread-release history after reset to gingerbread 2010-12-21 08:31:54 -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
c45f506538 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-07 22:37:54 -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