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
Brad Fitzpatrick
d36d650a81
NFC: async enabling/disabling, ala Bluewooth & Wifi.
...
Don't ANR when toggling.
Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
2010-10-18 15:25:49 -07:00
Roy West
dd49624ed0
Del "erase" from new unmount setting subtext
...
Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3
2010-10-18 03:12:57 -07:00
Roy West
8abc40bb11
Correct some typos, impose more consistency.
...
Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda
2010-10-17 09:19:34 -07:00
Dianne Hackborn
1337d0f70b
Implement issue #3094621 and #3094609 - wipe sd card
...
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command
Implements requested UI changes. Also some final tweaks to
Manage Applications.
Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
2010-10-16 16:27:25 -07:00
Kenny Root
3594b1b73d
Import revised translations DO NOT MERGE
...
Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
2010-10-15 15:24:57 -07:00
Nick Pelly
e1a9ca6862
Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
2010-10-15 10:56:05 -07:00
Amith Yamasani
1bdb7874ad
Make summary appear for both checked and unchecked NFC checkbox in Settings.
...
And remove the extra "Tag" in the summary.
Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
2010-10-15 10:00:40 -07:00
Roy West
2c4899737b
Change USB tab to USB storage if it fits
...
Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
2010-10-15 05:18:04 -07:00
Nick Pelly
a57eacef3c
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
...
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-15 02:15:27 -07:00
Roy West
d3abea0d70
Fix a few more cases of USB storage missed at 4am pass...
...
Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
2010-10-14 15:59:33 -07:00
Jaikumar Ganesh
022299dfce
Merge "Disconnect dock only if its connected." into gingerbread
2010-10-14 15:30:55 -07:00
Jaikumar Ganesh
9d03e98d22
Disconnect dock only if its connected.
...
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.
Bug: 3097224
Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
2010-10-14 15:09:57 -07:00
Kenny Root
b5848295b3
Merge "Import revised translations" into gingerbread
2010-10-14 14:16:47 -07:00
Kenny Root
4f6196a03d
Import revised translations
...
Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
2010-10-14 09:46:33 -07:00
Roy West
825db2da05
Update storage names to 10-13 decision; add USB erase nugget
...
Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
2010-10-14 05:07:45 -07:00
Jake Hamby
8021537ffe
BT settings wait for HS service before connect. DO NOT MERGE
...
Bluetooth connections from Settings app can sometimes fail if the
connection to BluetoothHeadsetService isn't ready. Changed code to
delay any headset connect or disconnect attempt when the service isn't
connected until onServiceConnected() is called.
Tested by adding a call to Thread.sleep(5000) before the return
statement in BluetoothHeadsetService.onBind(). This makes it easier to
kill the phone process and then attempt to connect in the settings app
before the service restarts.
Bug: 3048839
Change-Id: I2114ff8ad67c8c672fcf6ce0bf3de61fca7a49b3
2010-10-13 16:10:47 -07:00
Nick Pelly
792d43560b
Merge "Move NFC setting lower down the Setting's list." into gingerbread
2010-10-13 13:59:00 -07:00
Nick Pelly
72ce892dd9
Move NFC setting lower down the Setting's list.
...
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
2010-10-13 12:22:37 -07:00
Jaikumar Ganesh
0340371297
Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
2010-10-13 11:09:35 -07:00
Jaikumar Ganesh
268d1f1e4b
DO NOT MERGE Add null check before disconnecting a device.
...
Bug: 3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
2010-10-13 10:56:01 -07:00
Nick Pelly
083310d316
Update NFC settings description, and fix polarity.
...
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
2010-10-12 21:22:54 -07:00
Jaikumar Ganesh
bdf1310707
Merge "Call disconnect / connect without checking the current status" into gingerbread
2010-10-12 19:04:01 -07:00
Nick Pelly
cd99332fee
Merge "Update settings app for new NFC API." into gingerbread
2010-10-12 18:58:46 -07:00
Jaikumar Ganesh
d3a460cce7
Call disconnect / connect without checking the current status
...
Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.
Bug: 3076404
Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f
2010-10-12 16:19:40 -07:00
Nick Pelly
454d2ef051
Update settings app for new NFC API.
...
Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-12 13:07:06 -07:00
Kenny Root
737e91efb1
Merge "Don't show the sort menu for running process list" into gingerbread
2010-10-12 12:25:34 -07:00
Freeman Ng
1054e4890a
Merge "Hide "System tutorial" option if there's no IME tutorial bug: 3074212" into gingerbread
2010-10-12 11:06:46 -07:00
Kenny Root
673085af9e
Don't show the sort menu for running process list
...
You could bring up the menu and sort running processes by size or name
which would display the applications list at the same time the running
process list was being displayed. This happened because the
mApplicationsAdapter is used for the list of apps and is sortable, but
the running process list doesn't use the adapter.
Disable the menu when the running applications list is presented to
prevent this situation where two ListViews are visible.
Bug: 3084901
Change-Id: I5304cf7a1f426269ed4858e649729a35b9344717
2010-10-12 09:44:43 -07:00