Commit Graph

2022 Commits

Author SHA1 Message Date
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
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
Nick Pelly
ff8018dcbd Merge "Fix NFC permission." into gingerbread 2010-10-20 16:44:41 -07:00
Nick Pelly
f2917ac3c5 Fix NFC permission.
(it's not actually needed right now, hence why nothing was broken).

Change-Id: I52ea0b49a77eca4e3a688d37aa721d3483227553
2010-10-20 16:39:44 -07:00
Dianne Hackborn
916adce02d Fix issue #3108683: GRH18: Battery usage chart FCs
Make array more bigger, and bounds check the thing.

Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
2010-10-19 16:23:53 -07:00