Daniel Sandler
51f755abfd
am 9a8a28aa: Merge "Fix #6750492 : NPE in tablet status bar" into jb-dev
...
* commit '9a8a28aa72b9a4ebeaff3b30c497ce9bb5046083':
Fix #6750492 : NPE in tablet status bar
2012-06-28 11:07:32 -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
19910f1f1a
am e680c722: Merge "Fix issue #6706369 : Sometimes the "App info" popup shows..." into jb-dev
...
* commit 'e680c72211434777d50c1e20e6c06b5a3cdc3207':
Fix issue #6706369 : Sometimes the "App info" popup shows...
2012-06-28 10:53:18 -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
Scott Main
23ece33972
am c4f7873c: Merge "docs: fix g+ gms description" into jb-dev
...
* commit 'c4f7873cada2fca2d1d3390b113ca46c71dd86ad':
docs: fix g+ gms description
2012-06-28 10:40:18 -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
355adfe790
am d91cce85: Merge "Doc change: swap notification image for generic." into jb-dev
...
* commit 'd91cce8558d09295746588fa13a2cbb0f3e7ab59':
Doc change: swap notification image for generic.
2012-06-28 10:37:23 -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
2dca20e194
am 4fa46485: Merge "Update dumpsys power output." into jb-dev
...
* commit '4fa4648515c3c1f77a31da186a9fe31d6c509412':
Update dumpsys power output.
2012-06-28 10:00:04 -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
a9ee110cd9
am 89304586: Merge "Retain expanded state across violent updates." into jb-dev
...
* commit '8930458639527448429362255af96e94f5aba5ed':
Retain expanded state across violent updates.
2012-06-28 04:33:07 -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
d5aa20001a
am 6c2ecbd5: Merge "Doc change: update Missed Call part of notification image." into jb-dev
...
* commit '6c2ecbd5e3e7bcbd84be94704ec904f8c29ebd37':
Doc change: update Missed Call part of notification image.
2012-06-28 00:57:11 -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
2e662a2170
am c327025b: Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev
...
* commit 'c327025bd79595a78883460690e74b302f9999d2':
docs: ADK2 update for new IDE download files and instructions
2012-06-28 00:34:23 -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
7a2319120d
am e1c6947f: Doc change: update caption for notifications screen shot.
...
* commit 'e1c6947facebb4df082433ca8365c45847330de8':
Doc change: update caption for notifications screen shot.
2012-06-27 20:00:32 -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
691976fae6
am 29775794: 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
...
* commit '29775794d6014196063534415ad61d60e84e9c9a':
Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode.
2012-06-27 15:50:10 -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
4a02a5ccfc
am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev
...
* commit 'ca2c7b7d96625cf515af88ad30062405b38cb094':
Fix detection of CDMA CMAS cell broadcasts.
2012-06-27 15:30:17 -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
809705c331
am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '7bdc151eecf5cb01af19964c43e99f41069d093d':
Import translations. DO NOT MERGE
2012-06-27 14:44:43 -07: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
928c88774d
am c6a2fa8c: Merge "Disable assist gesture when keyguard is active" into jb-dev
...
* commit 'c6a2fa8cba32f5310a052cea2307b898f0522fab':
Disable assist gesture when keyguard is active
2012-06-27 13:29:16 -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
c16f40aecc
am fec0c188: Merge "docs: add info about live wallpaper picker" into jb-dev
...
* commit 'fec0c188ff7ab39b272561ea2e48aafc72c35ded':
docs: add info about live wallpaper picker
2012-06-27 02:15:12 -07:00
Scott Main
a31e954f0a
am b6d148d0: Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev
...
* commit 'b6d148d02a9764abd40af50b096599bb148571b3':
docs: remove empty page and expand system requirements based on URL hash
2012-06-27 02:15:09 -07: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
2c6a762c1a
am 84ea453c: Merge "Doc change: remove an unneeded file. Edits." into jb-dev
...
* commit '84ea453cc7a9f193cfef1b3e2af41935dbe15d02':
Doc change: remove an unneeded file. Edits.
2012-06-27 01:21:04 -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
aaff44ca5a
am aaecf93b: Merge "Doc change: add diff report for 16." into jb-dev
...
* commit 'aaecf93bf952471d004918fabfc3021f9c937c8d':
Doc change: add diff report for 16.
2012-06-27 01:17:06 -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
96e3a7e13e
am d9435b37: docs: ADK2 docs - update alternative build instructions
...
* commit 'd9435b37371b3b799ed2e8a93f9fba86ca874833':
docs: ADK2 docs - update alternative build instructions
2012-06-27 00:00:46 -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
453b6598d3
am 7547be05: Set up preview SDK for jellybean.
...
* commit '7547be054261ad8ef9176bf6fa74df80b417ba90':
Set up preview SDK for jellybean.
2012-06-26 22:53:31 -07:00
Dirk Dougherty
7547be0542
Set up preview SDK for jellybean.
...
Change-Id: I953cedece036e20f1eb56503a0c8492a0852ddc0
2012-06-26 22:44:38 -07:00
