77807 Commits

Author SHA1 Message Date
Chris Wren
8930458639 Merge "Retain expanded state across violent updates." into jb-dev 2012-06-28 04:30:48 -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
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
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
Katie McCormick
eb2ab86025 Merge "Doc update: Adding new GCM docs." into jb-dev 2012-06-26 15:29:05 -07:00
Katie McCormick
76c6d86b5e Doc update: Adding new GCM docs.
Change-Id: I98dcbad644e416538f6dcad64a063809f8662e24
2012-06-26 14:55:45 -07:00
Dianne Hackborn
ea401541c5 Fix issue #6730064: When turning off Nakasi, it very often...
...turns itself immediately back on.

The ON_AFTER_RELEASE flag is documented to not turn the screen on if
it is currently off.

Unfortunately, it didn't seem to actually do this -- it would just
cause a userActivity() call, which turns on the screen if it is
currently off.

Fix this by adding yet another boolean to that function to tell it
to not poke user activity if the screen is off.  (Yes the number of
booleans on it is now insane, and should be cleaned up after we
get through JB.)

Bug: 6730064
Change-Id: I850dfbc777c7668d08b7d63f42a293e22b878256
2012-06-26 14:44:08 -07:00
Joe Fernandez
fb4a0e452b Merge "docs: ADK 2012 documentation with AOA protocol docs" into jb-dev 2012-06-26 13:15:26 -07:00
Peter Ng
3c6f8e4da0 Merge "image typos in documents fix" into jb-dev 2012-06-26 13:12:45 -07:00
Gilles Debunne
f6656b80c2 Merge "Reducing the contrast of text underline" into jb-dev 2012-06-26 13:12:07 -07:00
Robert Ly
95bb409981 Merge "docs: rs api docs" into jb-dev 2012-06-26 12:14:04 -07:00
Robert Ly
fd73b5844c docs: rs api docs
Change-Id: Ib2f1ae1ba47118242d4a52b943f5eba26714aa1f
2012-06-26 12:07:13 -07:00
Peter Ng
c36b8655b9 image typos in documents fix
Change-Id: I357ff2d99bc2dff9ac27cfd6d1e97afb35740dbc
2012-06-26 11:18:29 -07:00
Kenny Root
c17f92ce04 Merge "Use removePackageLI instead of removing mPackages" into jb-dev 2012-06-26 10:34:44 -07:00
John Spurlock
64b7a3e995 Merge "TabletStatusBar: Lights-out shadow view should be taller" into jb-dev 2012-06-26 09:55:53 -07:00
Joe Fernandez
3a77ccc63f docs: ADK 2012 documentation with AOA protocol docs
Change-Id: Ife96b3ffa890d42fc97125b30bdd389448645562
2012-06-26 02:24:32 -07:00
Scott Main
e066fd3c9b Merge "docs: move NDK into Download section" into jb-dev 2012-06-25 21:17:49 -07:00
Nick Kralevich
ab294eeb20 Merge "DevicePolicyManagerService: dump less" into jb-dev 2012-06-25 18:43:56 -07:00