Mike Lockwood
61487da6ac
am e6c7e45f
: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
...
* commit 'e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
2011-03-14 13:34:57 -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
f018bd8cf3
am 36469186
: DO NOT MERGE WiMAX settings menu
...
* commit '36469186b7459d13688a2ca1c2316dbf172794dd':
DO NOT MERGE WiMAX settings menu
2011-03-09 23:11:59 -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
Lorenzo Colitti
a4fb8c8684
am f4393101
: Merge "Support configuring the protocol in APN settings." into gingerbread
...
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
Support configuring the protocol in APN settings.
2011-03-03 17:07:39 -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
9d76873546
am 0552d336
: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
...
* commit '0552d3366487b27c619c055a04c81b8af0b84d33':
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
2011-03-02 15:38:51 -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
058f62baff
am bd044818
: Import revised translations. DO NOT MERGE
...
* commit 'bd0448185f32d52e3561e1b10e00e16ec5b4a7cd':
Import revised translations. DO NOT MERGE
2011-02-18 15:22:41 -08:00
Eric Fischer
bd0448185f
Import revised translations. DO NOT MERGE
...
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
2011-02-14 17:25:07 -08:00
Amith Yamasani
255fa0e962
am aae04e43
: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
...
* commit 'aae04e43ec277c095e181933976dfa7bfd044288':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
2011-02-11 11:03:56 -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
d422079aeb
am 47d2ecd0
: Import revised translations. DO NOT MERGE
...
* commit '47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
Import revised translations. DO NOT MERGE
2011-02-08 17:33:14 -08:00
Eric Fischer
47d2ecd0c4
Import revised translations. DO NOT MERGE
...
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
2011-02-07 13:38:01 -08:00
Jake Hamby
47cb175396
am 1798fc04
: Merge "Fixed a memory leak in the bluetooth settings"
...
* commit '1798fc049eda5f6fd14be3a369eebe81c851abd2':
Fixed a memory leak in the bluetooth settings
2011-02-04 16:20:15 -08:00
Jake Hamby
1798fc049e
Merge "Fixed a memory leak in the bluetooth settings"
2011-02-04 16:12:54 -08:00
Eric Fischer
2b78f43322
am 93580e22
: Import revised translations. DO NOT MERGE
...
* commit '93580e222c156e06b348d228bec24d83836af1f2':
Import revised translations. DO NOT MERGE
2011-01-31 16:15:26 -08:00
Eric Fischer
93580e222c
Import revised translations. DO NOT MERGE
...
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
2011-01-31 12:25:49 -08:00
Eric Fischer
abdfaed8f4
am 5a2bb8c0
: Import revised translations. DO NOT MERGE
...
* commit '5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
2011-01-28 14:16:07 -08:00
Eric Fischer
5a2bb8c0dc
Import revised translations. DO NOT MERGE
...
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
2011-01-28 13:21:54 -08:00
Eric Fischer
0cd5e21a40
am 95112e5b
: Import revised translations. DO NOT MERGE
...
* commit '95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
2011-01-27 15:03:43 -08:00
Eric Fischer
95112e5b98
Import revised translations. DO NOT MERGE
...
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
2011-01-27 14:04:11 -08:00
Amith Yamasani
2768ae05bc
am f7fd4ca8
: Merge "Disable change PIN when PIN is inactive"
...
* commit 'f7fd4ca832e8ee28f0217d8096c3b401309a1f0f':
Disable change PIN when PIN is inactive
2011-01-18 09:08:41 -08:00
Amith Yamasani
f7fd4ca832
Merge "Disable change PIN when PIN is inactive"
2011-01-18 08:52:40 -08:00
Eric Fischer
40bcf565d3
am 6418d373
: Import translations for additional languages.
...
* commit '6418d373679ef0b73701bacc1de34f68f1c9ade8':
Import translations for additional languages.
2011-01-06 20:30:09 -08:00
Eric Fischer
6418d37367
Import translations for additional languages.
...
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
2011-01-06 10:39:31 -08:00
Gustaf Nilklint
00fa2f578e
Fixed a memory leak in the bluetooth settings
...
Release resources in onPause rather than onResume to fix a memory leak.
Without this fix the app will crash if you are in Bluetooth settings
and tap "Device name" and then roate the device a few times.
Change-Id: I57a8346247c13f5113e7c4ea39dde5b29a7359bb
2011-01-04 07:56:45 +01:00
Jean-Baptiste Queru
9a10fb0bbc
am e8531ff6
: Merge "Changed the text input type of APN name to plain text"
...
* commit 'e8531ff6a03a0542b7b1531ddd469befed9bab85':
Changed the text input type of APN name to plain text
2010-12-28 12:02:44 -08:00
Jean-Baptiste Queru
e8531ff6a0
Merge "Changed the text input type of APN name to plain text"
2010-12-28 11:52:15 -08:00
Nick Pelly
934c1b9f4b
am c1286804
: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
...
* commit 'c1286804cc839ec7006d6e9651c73ec7b3180157':
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
2010-12-10 17:22:30 -08:00
Nick Pelly
c1286804cc
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
2010-12-10 17:18:54 -08:00
Eric Fischer
5721cb1d52
am 99d2471d
: Import revised translations. DO NOT MERGE
...
* commit '99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8':
Import revised translations. DO NOT MERGE
2010-12-10 10:03:51 -08:00
Jean-Baptiste Queru
9b9c61f615
am 2a7c5425
: reconcile with open-source gingerbread
...
* commit '2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
2010-12-10 08:49:47 -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
bd73c73666
am 1acfef82
: merge from gingerbread
...
* commit '1acfef82bd464fdbd3765321a051e59728b4d72b':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-09 10:45:31 -08:00
Jean-Baptiste Queru
2a7c542594
reconcile with open-source gingerbread
...
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
2010-12-09 10:18:44 -08:00
Jean-Baptiste Queru
1acfef82bd
merge from gingerbread
...
Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
2010-12-09 09:11:15 -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
Gustaf Nilklint
83fc19df76
Disable change PIN when PIN is inactive
...
Disabled the option to change PIN code when PIN lock is disabled.
This is done by adding dependency to the checkbox above in the XML file.
Change-Id: Idafae0820297b8f7ba7a14f5ebe4f7e691547cc8
2010-12-06 10:21:13 +01:00
Jake Hamby
90b1f193ad
am b0fda6f5
: Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
...
* commit 'b0fda6f56a0ee3c42cf02813b5fc346382873c4f':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
2010-12-04 23:45:23 -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
ea04ee7559
am fa04d89f
: avoid view creation on orientation change
...
* commit 'fa04d89fd8dd8674375de7a10ca755056b88b811':
avoid view creation on orientation change
2010-12-01 15:53:32 -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
39f8dba114
am e1e257f4
: Import revised translations. DO NOT MERGE
...
* commit 'e1e257f4b45fcd5dd59b73295804df94eefc4970':
Import revised translations. DO NOT MERGE
2010-11-30 11:48:26 -08:00
Eric Fischer
e1e257f4b4
Import revised translations. DO NOT MERGE
...
Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f
2010-11-29 16:21:55 -08:00
Jean-Baptiste Queru
b68b35dd6a
am 04b646df
: Merge "Possible NumberFormatException of parseInt is outside try-catch"
...
* commit '04b646df1e9f00719d2d547fa1da59407bb6be67':
Possible NumberFormatException of parseInt is outside try-catch
2010-11-29 16:11:16 -08:00
Jean-Baptiste Queru
04b646df1e
Merge "Possible NumberFormatException of parseInt is outside try-catch"
2010-11-29 16:07:44 -08:00
Peter Kuterna
378b6f6740
Possible NumberFormatException of parseInt is outside try-catch
...
Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
2010-11-28 22:35:31 +01:00