77821 Commits

Author SHA1 Message Date
Eric Fischer
9aa2d2a5a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-28 11:48:21 -07:00
Chris Wren
2761ccd479 Merge "Retain expanded state across more than one violent update." into jb-dev 2012-06-28 11:40:34 -07:00
Chris Wren
5ae1ea8400 Retain expanded state across more than one violent update.
Bug: 6680363
Change-Id: Iebf2387fc5c8774c1c001dde5a4608d4e60720aa
2012-06-28 14:35:43 -04:00
Eric Fischer
a57b7a8ce4 Import translations. DO NOT MERGE
Change-Id: I5c3a2f0d534df06cf7d3385a2d369ba6edd09df7
Auto-generated-cl: translation import
2012-06-28 11:30:35 -07:00
Daniel Sandler
9a8a28aa72 Merge "Fix #6750492: NPE in tablet status bar" into jb-dev 2012-06-28 11:02:57 -07:00
Dianne Hackborn
e680c72211 Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev 2012-06-28 10:50:45 -07:00
Daniel Sandler
15986c66cb Fix #6750492: NPE in tablet status bar
Pull down a bugfix from BaseStatusBar.

Bug: 6750492
Change-Id: I9bd04e3a800d4dd2222844d2848208d611b60fe0
2012-06-28 13:38:28 -04:00
Scott Main
c4f7873cad Merge "docs: fix g+ gms description" into jb-dev 2012-06-28 10:37:41 -07:00
Dirk Dougherty
d91cce8558 Merge "Doc change: swap notification image for generic." into jb-dev 2012-06-28 10:34:56 -07:00
Craig Mautner
4fa4648515 Merge "Update dumpsys power output." into jb-dev 2012-06-28 09:56:47 -07:00
Robert Ly
fb2ed9869b docs: fix g+ gms description
Change-Id: Icff59207ab788c81cf8e53252813b9a207548e41
2012-06-28 08:05:20 -07:00
Chris Wren
8930458639 Merge "Retain expanded state across violent updates." into jb-dev 2012-06-28 04:30:48 -07:00
Dirk Dougherty
7b6be8ef4c Doc change: swap notification image for generic.
Change-Id: I10f8d877e86d9f8b9c03d31caab5dbd533d672c4
2012-06-28 00:57:27 -07:00
Dirk Dougherty
6c2ecbd5e3 Merge "Doc change: update Missed Call part of notification image." into jb-dev 2012-06-28 00:54:37 -07:00
Dirk Dougherty
3229a61cad Doc change: update Missed Call part of notification image.
Change-Id: Ibffe3dcefce343838ba5b3dfde1edf05bfc0f9ad
2012-06-28 00:52:08 -07:00
Joe Fernandez
c327025bd7 Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev 2012-06-28 00:31:03 -07:00
Joe Fernandez
caa008fdfb docs: ADK2 update for new IDE download files and instructions
Change-Id: Id0e3e42a0a0c19afafa039f9df6763ae337b1f0b
2012-06-28 00:10:49 -07:00
Dirk Dougherty
e1c6947fac Doc change: update caption for notifications screen shot.
Change-Id: I7d5a947a36f315365875887e540be9ecb7402175
2012-06-27 19:56:17 -07:00
Matthew Xie
29775794d6 Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev 2012-06-27 15:47:53 -07:00
Jake Hamby
ca2c7b7d96 Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev 2012-06-27 15:27:43 -07:00
Matthew Xie
9107e37b24 Get rid of the extra bt_disable call when turning on airplane mode
Get rid of enabling bt when in airplane mode.

Current code has 2 paths that trying to place bluetooth in cold state when
turning airplane mode on. This caused extra call of bt_disable that
causing a kernel sleep failure. The fix removes one of the sys call.
This CL keeps Bluetooth in cold state after turning airplane mode on
instead of seting it to hotoff state
bug 6563480

Change-Id: I30c413707157acb4a8e83ded9452256cf6260899
2012-06-27 15:12:01 -07:00
Chris Wren
c9433ecb51 Retain expanded state across violent updates.
Bug: 6680363
Change-Id: I81e3b3a4e15b4ed240af62ad1023d4bbd9aaa646
2012-06-27 17:57:56 -04:00
Ying Wang
7bdc151eec Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-27 14:41:20 -07:00
Ying Wang
0503ae7451 Import translations. DO NOT MERGE
Change-Id: I887e4963f5e4f7690461900b5f5c993d42c8db67
2012-06-27 14:00:38 -07:00
John Spurlock
c6a2fa8cba Merge "Disable assist gesture when keyguard is active" into jb-dev 2012-06-27 13:27:09 -07:00
John Spurlock
67ad368d4d Disable assist gesture when keyguard is active
Prevent search gesture from firing when keyguard is in restricted input mode,
e.g. in Emergency Dialer. Also disable the Home touch listener in this mode to
avoid bringing up the ring.  Affects both phone and tablets.

Bug: 6723749
Change-Id: I60f0aebfcce4cf7f66798ee1212ea326bdad3ef0
2012-06-27 09:32:55 -04:00
Scott Main
fec0c188ff Merge "docs: add info about live wallpaper picker" into jb-dev 2012-06-27 02:13:17 -07:00
Scott Main
b6d148d02a Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev 2012-06-27 02:12:35 -07:00
Dirk Dougherty
84ea453cc7 Merge "Doc change: remove an unneeded file. Edits." into jb-dev 2012-06-27 01:18:22 -07:00
Dirk Dougherty
1e5d22b74c Doc change: remove an unneeded file. Edits.
Change-Id: I5e89a6e224b0f90207bf3bc625f8d330a28edf37
2012-06-27 01:15:26 -07:00
Dirk Dougherty
aaecf93bf9 Merge "Doc change: add diff report for 16." into jb-dev 2012-06-27 01:14:28 -07:00
Scott Main
ce6c850206 docs: remove empty page and expand system requirements based on URL hash
Change-Id: I9e90af894e6213ef642d3341d169ebb4ec0b8628
2012-06-27 00:55:18 -07:00
Joe Fernandez
d9435b3737 docs: ADK2 docs - update alternative build instructions
Change-Id: I395749198a0c1589b71d49638620708e2dc2f6ae
2012-06-26 23:32:03 -07:00
Dirk Dougherty
dbccc9012e Doc change: add diff report for 16.
Change-Id: I38b2e59ac3a553ab7bbde8814e9fb099aa085638
2012-06-26 22:55:30 -07:00
Dirk Dougherty
7547be0542 Set up preview SDK for jellybean.
Change-Id: I953cedece036e20f1eb56503a0c8492a0852ddc0
2012-06-26 22:44:38 -07:00
Scott Main
3fd21b562c docs: add info about live wallpaper picker
Change-Id: Idc11d9f091117dec53b19b352d24e97dab2c4bd0
2012-06-26 22:17:10 -07:00
Scott Main
cdb3f9c45b Merge "docs: add api overview for jb" into jb-dev 2012-06-26 21:54:08 -07:00
Scott Main
60dd520d37 docs: add api overview for jb
Change-Id: Ibb916138026bb13bb424c826fe8faa563c71bf94
2012-06-26 21:41:25 -07:00
Robert Ly
aa16a2e055 Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev 2012-06-26 17:58:57 -07:00
Robert Ly
864090eeaa docs: remove graphics rs docs and restructure existing docs
Change-Id: I8603c827095143327053e8eba855177ec466a948
2012-06-26 17:51:19 -07:00
Craig Mautner
672083b88a Update dumpsys power output.
A little more detail on the animation state. For aid in debugging
b/6720247.

Change-Id: Ibfabf7fc8822ccb74bb83e2fd8e53004691dcd76
2012-06-26 17:42:17 -07:00
Mike Lockwood
7017d51e14 Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 2012-06-26 16:57:02 -07:00
Scott Main
947ce39e56 Merge "docs: add landing for gcm" into jb-dev 2012-06-26 16:53:44 -07:00
Robert Ly
93b4fbef19 docs: add landing for gcm
Change-Id: Icfe158670c0a07a6dffed496a444e49b5c5ef926
2012-06-26 16:46:21 -07:00
Joe Fernandez
3632af395c Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev 2012-06-26 16:45:31 -07:00
Joe Fernandez
623898f099 Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 2012-06-26 16:45:12 -07:00
Dianne Hackborn
7f3b379e99 Fix issue #6706369: Sometimes the "App info" popup shows...
...even though I don't long press

When you start scrolling from a point between two notification
items, only the first down goes to SwipeHelper.onInterceptTouchEvent(),
and the following events go to SwipeHelper.onTouchEvent().  However
when we call SwipeHelper.onTouchEvent(), we immediately bail if we are
not in the drag state, so we never clear the pending long press event.

Bug: 6706369
Change-Id: Icc46fba62fe7ee334d8d62ac39195d7c3aeff705
2012-06-26 16:39:02 -07:00
Dianne Hackborn
3bb98aec93 Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 2012-06-26 16:36:36 -07:00
Mike Lockwood
1e855d98aa MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
Bug: 6684451

Change-Id: I90204550ccfcd1b7a5b1973bed2a88e934aae053
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-06-26 16:33:05 -07:00
Joe Fernandez
3e820bee2b docs: GL Tracer, Device Monitor Tools for SDK r20
Change-Id: Ib45210b88a7eb93e3bba4f7d535f344ccb054a72
2012-06-26 16:27:18 -07:00