OSDN Git Service
Daisuke Miyakawa [Tue, 19 Oct 2010 17:10:25 +0000 (10:10 -0700)]
UI refresh
Bug:
3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
Roy West [Tue, 19 Oct 2010 02:57:59 +0000 (19:57 -0700)]
resolved conflicts for merge of
98f3aff3 to master
Change-Id: Icfc107998728e8571cf1e887027ab0067f3d40f8
Dan Morrill [Mon, 18 Oct 2010 22:43:18 +0000 (15:43 -0700)]
Merge commit '
b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix
Conflicts:
res/values/strings.xml
Change-Id: I5da845de77ffd95c5008fdc081cc1e3abef4fad5
Dan Morrill [Mon, 18 Oct 2010 22:23:16 +0000 (15:23 -0700)]
Merge commit '
593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix
Conflicts:
res/values/strings.xml
src/com/android/settings/deviceinfo/Memory.java
Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
Roy West [Mon, 18 Oct 2010 18:33:34 +0000 (11:33 -0700)]
am
dd49624e: Del "erase" from new unmount setting subtext
Merge commit '
dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp
* commit '
dd49624ed049d6f2f9946f71381bcde83f19e5e0':
Del "erase" from new unmount setting subtext
Kenny Root [Mon, 18 Oct 2010 17:32:46 +0000 (10:32 -0700)]
am
ea86bcd1: (-s ours) am
3594b1b7: Import revised translations DO NOT MERGE
Merge commit '
ea86bcd12bed863ec6d5109ea84572f355c88609'
* commit '
ea86bcd12bed863ec6d5109ea84572f355c88609':
Import revised translations DO NOT MERGE
Roy West [Mon, 18 Oct 2010 10:12:57 +0000 (03:12 -0700)]
Del "erase" from new unmount setting subtext
Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3
Roy West [Sun, 17 Oct 2010 21:04:25 +0000 (14:04 -0700)]
am
8abc40bb: Correct some typos, impose more consistency.
Merge commit '
8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp
* commit '
8abc40bb11690125fa441775041e0a64c79acc43':
Correct some typos, impose more consistency.
Nick Pelly [Sun, 17 Oct 2010 18:15:48 +0000 (11:15 -0700)]
am
fb515337: am
e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit '
fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'
* commit '
fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Roy West [Sun, 17 Oct 2010 16:19:34 +0000 (09:19 -0700)]
Correct some typos, impose more consistency.
Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda
Dianne Hackborn [Sat, 16 Oct 2010 23:55:30 +0000 (16:55 -0700)]
am
1337d0f7: Implement issue #
3094621 and #
3094609 - wipe sd card
Merge commit '
1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp
* commit '
1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
Implement issue #
3094621 and #
3094609 - wipe sd card
Dianne Hackborn [Thu, 14 Oct 2010 18:58:30 +0000 (11:58 -0700)]
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
Amith Yamasani [Sat, 16 Oct 2010 16:43:15 +0000 (09:43 -0700)]
am
8de45a66: am
1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '
8de45a6686b298d09c5195e332f202223a555b91'
* commit '
8de45a6686b298d09c5195e332f202223a555b91':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Roy West [Sat, 16 Oct 2010 16:13:43 +0000 (09:13 -0700)]
am
d3c1749b: am
2c489973: Change USB tab to USB storage if it fits
Merge commit '
d3c1749b779397612f82e347bb0d886b1d9a35bc'
* commit '
d3c1749b779397612f82e347bb0d886b1d9a35bc':
Change USB tab to USB storage if it fits
Roy West [Sat, 16 Oct 2010 15:59:43 +0000 (08:59 -0700)]
am
cfcad4e4: am
d3abea0d: Fix a few more cases of USB storage missed at 4am pass...
Merge commit '
cfcad4e45f422606b5ce5e09a6e53ba58e790f63'
* commit '
cfcad4e45f422606b5ce5e09a6e53ba58e790f63':
Fix a few more cases of USB storage missed at 4am pass...
Jaikumar Ganesh [Sat, 16 Oct 2010 15:52:36 +0000 (08:52 -0700)]
am
7805fa99: am
022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '
7805fa99ffce21bb9b016ffdd5375d331b9a8a54'
* commit '
7805fa99ffce21bb9b016ffdd5375d331b9a8a54':
Disconnect dock only if its connected.
Kenny Root [Sat, 16 Oct 2010 01:41:47 +0000 (18:41 -0700)]
am
3594b1b7: Import revised translations DO NOT MERGE
Merge commit '
3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp
* commit '
3594b1b73d022d5815bcdef78e6143cfd63ee354':
Import revised translations DO NOT MERGE
Nick Pelly [Sat, 16 Oct 2010 01:21:06 +0000 (18:21 -0700)]
am
e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit '
e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit '
e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Kenny Root [Fri, 15 Oct 2010 23:49:33 +0000 (16:49 -0700)]
am
c915d16a: (-s ours) am
b5848295: Merge "Import revised translations" into gingerbread
Merge commit '
c915d16a909cdb69b8de2fa957a388025f022de7'
* commit '
c915d16a909cdb69b8de2fa957a388025f022de7':
Import revised translations
Kenny Root [Fri, 15 Oct 2010 22:24:57 +0000 (15:24 -0700)]
Import revised translations DO NOT MERGE
Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
Kenny Root [Fri, 15 Oct 2010 21:22:24 +0000 (14:22 -0700)]
Merge "resolved conflicts for merge of
2a612605 to master"
Kenny Root [Fri, 15 Oct 2010 21:22:09 +0000 (14:22 -0700)]
resolved conflicts for merge of
2a612605 to master
Change-Id: Ia897f03502ea1529b6d8475183b01abff9b795be
Jim Miller [Fri, 15 Oct 2010 19:42:00 +0000 (12:42 -0700)]
Fix
3100926: Prevent proguard from stripping OwnerInfo
This just renames OwnerInfo to OwnerInfoSettings so the existing
proguard rule picks it up.
Change-Id: Ie5682d77e8efe22a922bf750d4689cafd50e7a65
Nick Pelly [Fri, 15 Oct 2010 17:56:05 +0000 (10:56 -0700)]
Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Amith Yamasani [Fri, 15 Oct 2010 17:06:18 +0000 (10:06 -0700)]
am
1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '
1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp
* commit '
1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Amith Yamasani [Fri, 15 Oct 2010 00:20:59 +0000 (17:20 -0700)]
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
Jake Hamby [Fri, 15 Oct 2010 16:11:05 +0000 (09:11 -0700)]
am
8028cea1: (-s ours) am
8021537f: BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '
8028cea196968a4744ac4b095f6fe6bc32467375'
* commit '
8028cea196968a4744ac4b095f6fe6bc32467375':
BT settings wait for HS service before connect. DO NOT MERGE
Roy West [Fri, 15 Oct 2010 15:54:08 +0000 (08:54 -0700)]
am
2c489973: Change USB tab to USB storage if it fits
Merge commit '
2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp
* commit '
2c4899737be92b858a9e2d9d743709cae310149b':
Change USB tab to USB storage if it fits
Nick Pelly [Fri, 15 Oct 2010 15:31:26 +0000 (08:31 -0700)]
am
da08f31f: am
792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread
Merge commit '
da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c'
* commit '
da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c':
Move NFC setting lower down the Setting's list.
Roy West [Fri, 15 Oct 2010 12:18:04 +0000 (05:18 -0700)]
Change USB tab to USB storage if it fits
Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
Nick Pelly [Fri, 15 Oct 2010 08:19:43 +0000 (01:19 -0700)]
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Fri, 15 Oct 2010 08:08:37 +0000 (01:08 -0700)]
Merge "Turn on hardware acceleration of rendering."
Jaikumar Ganesh [Fri, 15 Oct 2010 07:06:02 +0000 (00:06 -0700)]
am
836b4297: (-s ours) am
03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Merge commit '
836b4297ccde47ae6356b2a805394d3285368144'
* commit '
836b4297ccde47ae6356b2a805394d3285368144':
DO NOT MERGE Add null check before disconnecting a device.
Nick Pelly [Fri, 15 Oct 2010 05:14:34 +0000 (22:14 -0700)]
am
f4e4319f: am
083310d3: Update NFC settings description, and fix polarity.
Merge commit '
f4e4319f4162c5dca14a9acc00bb5a2df0e452b3'
* commit '
f4e4319f4162c5dca14a9acc00bb5a2df0e452b3':
Update NFC settings description, and fix polarity.
Jaikumar Ganesh [Fri, 15 Oct 2010 02:30:08 +0000 (19:30 -0700)]
am
0d5e320c: am
bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread
Merge commit '
0d5e320cdd9cbd76012c0a1aec157e358d05891e'
* commit '
0d5e320cdd9cbd76012c0a1aec157e358d05891e':
Call disconnect / connect without checking the current status
Nick Pelly [Fri, 15 Oct 2010 02:29:44 +0000 (19:29 -0700)]
am
b3c4365d: am
cd99332f: Merge "Update settings app for new NFC API." into gingerbread
Merge commit '
b3c4365d10047eae367b529d98d5a90d052f6393'
* commit '
b3c4365d10047eae367b529d98d5a90d052f6393':
Update settings app for new NFC API.
Roy West [Fri, 15 Oct 2010 01:26:01 +0000 (18:26 -0700)]
am
d3abea0d: Fix a few more cases of USB storage missed at 4am pass...
Merge commit '
d3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp
* commit '
d3abea0d70648e77e694780b7e139b0ed36ba483':
Fix a few more cases of USB storage missed at 4am pass...
Dianne Hackborn [Fri, 15 Oct 2010 00:38:48 +0000 (17:38 -0700)]
Turn on hardware acceleration of rendering.
Change-Id: Iaa6de77738e097138d33d9d4c9e60eb471680d69
Roy West [Thu, 14 Oct 2010 22:59:33 +0000 (15:59 -0700)]
Fix a few more cases of USB storage missed at 4am pass...
Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
Jim Miller [Thu, 14 Oct 2010 22:55:04 +0000 (15:55 -0700)]
Merge "Fix
3024528: Initial implementation of owner info to enable dogfooding"
Jim Miller [Thu, 14 Oct 2010 04:11:07 +0000 (21:11 -0700)]
Fix
3024528: Initial implementation of owner info to enable dogfooding
This is a quick UI implementation to allow owner info to be changed
on LockScreen for dogfooding.
Change-Id: I0dc781def594d1c921c44348c130f509798a71f4
Jaikumar Ganesh [Thu, 14 Oct 2010 22:33:42 +0000 (15:33 -0700)]
am
022299df: Merge "Disconnect dock only if its connected." into gingerbread
Merge commit '
022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp
* commit '
022299dfce6a705a8cbaff972a4309da6e90a8c2':
Disconnect dock only if its connected.
Jaikumar Ganesh [Thu, 14 Oct 2010 22:30:55 +0000 (15:30 -0700)]
Merge "Disconnect dock only if its connected." into gingerbread
Jaikumar Ganesh [Thu, 14 Oct 2010 22:01:38 +0000 (15:01 -0700)]
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
Kenny Root [Thu, 14 Oct 2010 21:24:49 +0000 (14:24 -0700)]
am
b5848295: Merge "Import revised translations" into gingerbread
Merge commit '
b5848295b346df619999458ad55ba8ce1f88bf4f' into gingerbread-plus-aosp
* commit '
b5848295b346df619999458ad55ba8ce1f88bf4f':
Import revised translations
Kenny Root [Thu, 14 Oct 2010 21:16:47 +0000 (14:16 -0700)]
Merge "Import revised translations" into gingerbread
Roy West [Thu, 14 Oct 2010 19:03:12 +0000 (12:03 -0700)]
am
825db2da: Update storage names to 10-13 decision; add USB erase nugget
Merge commit '
825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp
* commit '
825db2da053598d36b5021b3468c7d599ee96a7c':
Update storage names to 10-13 decision; add USB erase nugget
Irfan Sheriff [Thu, 14 Oct 2010 18:42:12 +0000 (11:42 -0700)]
limit max length of ssid and password
Bug:
2675734
Change-Id: I58bc6b095c3d03fd06e3768b23c32718dd964516
Signed-off-by: jmzhu <jmzhu@marvell.com>
Kenny Root [Thu, 14 Oct 2010 16:46:33 +0000 (09:46 -0700)]
Import revised translations
Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
Roy West [Thu, 14 Oct 2010 12:07:45 +0000 (05:07 -0700)]
Update storage names to 10-13 decision; add USB erase nugget
Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
Kenny Root [Thu, 14 Oct 2010 02:15:02 +0000 (19:15 -0700)]
am
52e8542d: am
737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread
Merge commit '
52e8542d9dfb9c0d9a3530df1d790a0275d27f31'
* commit '
52e8542d9dfb9c0d9a3530df1d790a0275d27f31':
Don't show the sort menu for running process list
Freeman Ng [Thu, 14 Oct 2010 02:09:08 +0000 (19:09 -0700)]
resolved conflicts for merge of
59561e0a to master
Change-Id: I9d031ce8f9627bb5e8b28f867e2890c354856df9
Amith Yamasani [Wed, 13 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "Fix NPE in BT Settings launch from a shortcut."
Jake Hamby [Wed, 13 Oct 2010 23:28:34 +0000 (16:28 -0700)]
am
8021537f: BT settings wait for HS service before connect. DO NOT MERGE
Merge commit '
8021537ffea45d1a36274217610a314b3a0ac774' into gingerbread-plus-aosp
* commit '
8021537ffea45d1a36274217610a314b3a0ac774':
BT settings wait for HS service before connect. DO NOT MERGE
Jake Hamby [Tue, 12 Oct 2010 23:12:06 +0000 (16:12 -0700)]
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
Roy West [Wed, 13 Oct 2010 22:58:36 +0000 (15:58 -0700)]
am
f233ec77: am
30186392: With luck, final take on bug3076083, re back up settting
Merge commit '
f233ec77eb359aebd0276a27b09c0abe8e0f67ea'
* commit '
f233ec77eb359aebd0276a27b09c0abe8e0f67ea':
With luck, final take on bug3076083, re back up settting
Nick Pelly [Wed, 13 Oct 2010 21:23:05 +0000 (14:23 -0700)]
am
792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread
Merge commit '
792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp
* commit '
792d43560bdbf2f9982eb918cd841672ecfcf9de':
Move NFC setting lower down the Setting's list.
Nick Pelly [Wed, 13 Oct 2010 20:59:00 +0000 (13:59 -0700)]
Merge "Move NFC setting lower down the Setting's list." into gingerbread
Amith Yamasani [Wed, 13 Oct 2010 20:33:32 +0000 (13:33 -0700)]
Fix NPE in BT Settings launch from a shortcut.
Bug:
3089335
Nick Pelly [Wed, 13 Oct 2010 19:22:37 +0000 (12:22 -0700)]
Move NFC setting lower down the Setting's list.
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
Jaikumar Ganesh [Wed, 13 Oct 2010 18:13:33 +0000 (11:13 -0700)]
am
03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Merge commit '
0340371297887290d7593d7c346e422a4c9ecd1a' into gingerbread-plus-aosp
* commit '
0340371297887290d7593d7c346e422a4c9ecd1a':
DO NOT MERGE Add null check before disconnecting a device.
Jaikumar Ganesh [Wed, 13 Oct 2010 18:09:35 +0000 (11:09 -0700)]
Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
Jaikumar Ganesh [Wed, 13 Oct 2010 17:53:05 +0000 (10:53 -0700)]
DO NOT MERGE Add null check before disconnecting a device.
Bug:
3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
Nick Pelly [Wed, 13 Oct 2010 04:27:48 +0000 (21:27 -0700)]
am
083310d3: Update NFC settings description, and fix polarity.
Merge commit '
083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp
* commit '
083310d316059c6592120c32e1c0b736e85b83c0':
Update NFC settings description, and fix polarity.
Nick Pelly [Wed, 13 Oct 2010 04:22:54 +0000 (21:22 -0700)]
Update NFC settings description, and fix polarity.
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
Jaikumar Ganesh [Wed, 13 Oct 2010 02:06:15 +0000 (19:06 -0700)]
am
bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread
Merge commit '
bdf1310707e436db484113d7aa2881c966cddd0f' into gingerbread-plus-aosp
* commit '
bdf1310707e436db484113d7aa2881c966cddd0f':
Call disconnect / connect without checking the current status
Nick Pelly [Wed, 13 Oct 2010 02:04:17 +0000 (19:04 -0700)]
am
cd99332f: Merge "Update settings app for new NFC API." into gingerbread
Merge commit '
cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp
* commit '
cd99332fee649afd85798499cea5c45a098b8a20':
Update settings app for new NFC API.
Jaikumar Ganesh [Wed, 13 Oct 2010 02:04:01 +0000 (19:04 -0700)]
Merge "Call disconnect / connect without checking the current status" into gingerbread
Nick Pelly [Wed, 13 Oct 2010 01:58:46 +0000 (18:58 -0700)]
Merge "Update settings app for new NFC API." into gingerbread
Jaikumar Ganesh [Tue, 12 Oct 2010 23:14:10 +0000 (16:14 -0700)]
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
Jake Hamby [Tue, 12 Oct 2010 20:18:21 +0000 (13:18 -0700)]
am
d7f7213a: am
4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread
Merge commit '
d7f7213af27fa6c5e476bb8a8d2951feb5e630b5'
* commit '
d7f7213af27fa6c5e476bb8a8d2951feb5e630b5':
Fix bug where car dock sometimes doesn't connect.
Nick Pelly [Tue, 12 Oct 2010 20:07:06 +0000 (13:07 -0700)]
Update settings app for new NFC API.
Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com>
Kenny Root [Tue, 12 Oct 2010 19:29:15 +0000 (12:29 -0700)]
am
737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread
Merge commit '
737e91efb15fe5908781bc1cf446d28abc7726e8' into gingerbread-plus-aosp
* commit '
737e91efb15fe5908781bc1cf446d28abc7726e8':
Don't show the sort menu for running process list
Kenny Root [Tue, 12 Oct 2010 19:25:34 +0000 (12:25 -0700)]
Merge "Don't show the sort menu for running process list" into gingerbread
Freeman Ng [Tue, 12 Oct 2010 18:23:29 +0000 (11:23 -0700)]
am
1054e489: Merge "Hide "System tutorial" option if there\'s no IME tutorial bug:
3074212" into gingerbread
Merge commit '
1054e4890ae50d2550ee822f0680346f48d48c97' into gingerbread-plus-aosp
* commit '
1054e4890ae50d2550ee822f0680346f48d48c97':
Hide "System tutorial" option if there's no IME tutorial
Freeman Ng [Tue, 12 Oct 2010 18:06:46 +0000 (11:06 -0700)]
Merge "Hide "System tutorial" option if there's no IME tutorial bug:
3074212" into gingerbread
Irfan Sheriff [Tue, 12 Oct 2010 16:49:14 +0000 (09:49 -0700)]
am
52ad3f2f: am
566b5bb0: Improve password hint visibility
Merge commit '
52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2'
* commit '
52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2':
Improve password hint visibility
Kenny Root [Tue, 12 Oct 2010 16:42:44 +0000 (09:42 -0700)]
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
Freeman Ng [Tue, 12 Oct 2010 01:51:34 +0000 (18:51 -0700)]
Hide "System tutorial" option if there's no IME tutorial
bug:
3074212
Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e
Jean-Baptiste Queru [Tue, 12 Oct 2010 00:49:52 +0000 (17:49 -0700)]
am
80455f36: am
b84291bb: Merge "Support showing "Cold" battery health."
Merge commit '
80455f367f968f64037dd32b3857891c9681664b'
* commit '
80455f367f968f64037dd32b3857891c9681664b':
Support showing "Cold" battery health.
Roy West [Tue, 12 Oct 2010 00:39:34 +0000 (17:39 -0700)]
am
30186392: With luck, final take on bug3076083, re back up settting
Merge commit '
3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp
* commit '
3018639200a3f04d274166e26c98307ab07fc3b9':
With luck, final take on bug3076083, re back up settting
Roy West [Tue, 12 Oct 2010 00:34:27 +0000 (17:34 -0700)]
With luck, final take on bug3076083, re back up settting
Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
Jake Hamby [Mon, 11 Oct 2010 20:07:09 +0000 (13:07 -0700)]
am
4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread
Merge commit '
4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp
* commit '
4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
Fix bug where car dock sometimes doesn't connect.
Jake Hamby [Mon, 11 Oct 2010 20:05:11 +0000 (13:05 -0700)]
Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread
Irfan Sheriff [Mon, 11 Oct 2010 17:30:17 +0000 (10:30 -0700)]
am
566b5bb0: Improve password hint visibility
Merge commit '
566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp
* commit '
566b5bb0f91224069bbc98ea7042d22c8929aa59':
Improve password hint visibility
Irfan Sheriff [Mon, 11 Oct 2010 17:26:14 +0000 (10:26 -0700)]
Improve password hint visibility
Bug:
3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
Roy West [Mon, 11 Oct 2010 17:03:48 +0000 (10:03 -0700)]
am
81635077: am
effdd53f: Fix bug3076083 re backup setting strings
Merge commit '
816350778ad2da0024cbd5d1838ecbcea8f018be'
* commit '
816350778ad2da0024cbd5d1838ecbcea8f018be':
Fix bug3076083 re backup setting strings
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:50:41 +0000 (17:50 -0700)]
am
b84291bb: Merge "Support showing "Cold" battery health."
Merge commit '
b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp
* commit '
b84291bbecb1ab8141cf8f56fd3d1523e5c707a6':
Support showing "Cold" battery health.
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:37:59 +0000 (17:37 -0700)]
Merge "Support showing "Cold" battery health."
Roy West [Sun, 10 Oct 2010 19:52:25 +0000 (12:52 -0700)]
Irfan Sheriff [Sun, 10 Oct 2010 19:22:04 +0000 (12:22 -0700)]
Merge "Fix issue with limiting access points"
Roy West [Sun, 10 Oct 2010 18:03:45 +0000 (11:03 -0700)]
Eric Fischer [Sun, 10 Oct 2010 16:06:38 +0000 (09:06 -0700)]
am
5e51c769: (-s ours) am
d86f58a9: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
5e51c769c77cad4d05446d888b0cf742b56a7318'
* commit '
5e51c769c77cad4d05446d888b0cf742b56a7318':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Sun, 10 Oct 2010 16:05:02 +0000 (09:05 -0700)]
resolved conflicts for merge of
10ebf928 to master
Change-Id: I7da3cff9619aa6ecdc860a24d65b5ca9f0b898bc
Jean-Baptiste Queru [Sun, 10 Oct 2010 15:25:21 +0000 (08:25 -0700)]
resolved conflicts for merge of
0eb550ef to master
Change-Id: Id7434c6e95a688bf97786177a8dbecb4c3c5dc95
Roy West [Sat, 9 Oct 2010 17:07:54 +0000 (10:07 -0700)]
am
effdd53f: Fix bug3076083 re backup setting strings
Merge commit '
effdd53ff863d2ff8ffe64065c16b06ba01b3a8a' into gingerbread-plus-aosp
* commit '
effdd53ff863d2ff8ffe64065c16b06ba01b3a8a':
Fix bug3076083 re backup setting strings
Eric Fischer [Sat, 9 Oct 2010 16:40:24 +0000 (09:40 -0700)]
am
27db062d: (-s ours) am
84c8c175: Import revised translations. DO NOT MERGE
Merge commit '
27db062dd8464d3519d01780daf5516770ee83b8'
* commit '
27db062dd8464d3519d01780daf5516770ee83b8':
Import revised translations. DO NOT MERGE
Roy West [Sat, 9 Oct 2010 16:40:23 +0000 (09:40 -0700)]
Fix bug3076083 re backup setting strings
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
Fabrice Di Meglio [Sat, 9 Oct 2010 00:30:26 +0000 (17:30 -0700)]
Merge "Fix bug #
3077713 (Account Sync status is sometimes not reflecting the real status)"
Fabrice Di Meglio [Sat, 9 Oct 2010 00:09:00 +0000 (17:09 -0700)]
Fix bug #
3077713 (Account Sync status is sometimes not reflecting the real status)
- make status refresh thru onResume()
This issue was a regression from the change to use Fragments
Change-Id: I5e293c4a72bdc70f02ccfe4fc84bfb32e2887fad
OSDN Git Service
