drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,261 Commits 1 Branch 0 Tags
Commit Graph

81261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
3f2ccf5620 Import translations. DO NOT MERGE 
Change-Id: I9bb9193fdc8ad49606c4897fc29cd73fe5c649fa
Auto-generated-cl: translation import
 2012-06-28 11:46:49 -07:00
Chris Wren
4aa86813d1 am a9ee110c: am 89304586: Merge "Retain expanded state across violent updates." into jb-dev 
* commit 'a9ee110cd955a57ecec725f1357711876a418d2c':
  Retain expanded state across violent updates.
 2012-06-28 04:36:43 -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
9f88c45256 am d5aa2000: am 6c2ecbd5: Merge "Doc change: update Missed Call part of notification image." into jb-dev 
* commit 'd5aa20001a2983ad0e1883cd7f26b52404647951':
  Doc change: update Missed Call part of notification image.
 2012-06-28 01:00:29 -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
42e4c6d08c am 2e662a21: am c327025b: Merge "docs: ADK2 update for new IDE download files and instructions" into jb-dev 
* commit '2e662a21704a962e3c17fd26e199c9b640884365':
  docs: ADK2 update for new IDE download files and instructions
 2012-06-28 00:37:54 -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
eb6a750204 am 7a231912: am e1c6947f: Doc change: update caption for notifications screen shot. 
* commit '7a2319120de29fbb27ef1df63ae91d1466aaf323':
  Doc change: update caption for notifications screen shot.
 2012-06-27 20:03:34 -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
Gilles Debunne
6640891125 Merge "Added comments describing the span limit attributes" 2012-06-27 17:21:47 -07:00
Teng-Hui Zhu
06d0aa8ed1 Merge "Avoid redundant reload in inline mode after exit from full screen." 2012-06-27 16:28:11 -07:00
Matthew Xie
530c843a8f am 691976fa: 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 '691976fae6ff7ef925e411e9e7b273d2623072bf':
  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:53:07 -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
Teng-Hui Zhu
c3a2858de9 Avoid redundant reload in inline mode after exit from full screen. 
bug:5710646

First, if we exit the full screen mode while playing, we can continue to play
in inline mode.

If it is paused, then we can avoid a reload if user try to play the same video
again after the full screen mode.

webkit change:
https://android-git.corp.google.com/g/#/c/202138/

Change-Id: Ia69fa22a50d916cd8dd2b995cf3531fe9b637531
 2012-06-27 15:48:02 -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
845b6532b0 am 4a02a5cc: am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev 
* commit '4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a':
  Fix detection of CDMA CMAS cell broadcasts.
 2012-06-27 15:33:57 -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
Gilles Debunne
d3236dc167 Merge "Ensure batch edit mode is ended on window focus loss" 2012-06-27 15:23:08 -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
30142a7ea5 am 809705c3: (-s ours) am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '809705c33144e66e51ef4a2f17ad8b02eed5cd80':
  Import translations. DO NOT MERGE
 2012-06-27 14:48:15 -07: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
9f198e9903 Merge "Import translations. DO NOT MERGE" 2012-06-27 14:41:06 -07:00
Ying Wang
c6c05ed4ed Merge "Import translations. DO NOT MERGE" 2012-06-27 14:40:23 -07:00
Ying Wang
76f80a590b Import translations. DO NOT MERGE 
Change-Id: I8bf6a70aa52c82f902b7ac5d1df629656a2b19c5
 2012-06-27 14:29:30 -07:00
John Grossman
7c67fcb2f9 am 02792467: (-s ours) Utils: Fix a bug in the linear transformation code. 
* commit '02792467f9a3b5e3c566f2f0881738d3f1e8131d':
  Utils: Fix a bug in the linear transformation code.
 2012-06-27 14:21:05 -07:00
Ying Wang
2537012ad9 Import translations. DO NOT MERGE 
Change-Id: I36ca6b7f93e73b04ac742b3d7d640ef3c1bf48dd
 2012-06-27 14:09:58 -07:00
Ying Wang
0503ae7451 Import translations. DO NOT MERGE 
Change-Id: I887e4963f5e4f7690461900b5f5c993d42c8db67
 2012-06-27 14:00:38 -07:00
John Spurlock
4c3cc7d4c9 am 928c8877: am c6a2fa8c: Merge "Disable assist gesture when keyguard is active" into jb-dev 
* commit '928c88774db7d89036aef0f4286f7414b3a597f3':
  Disable assist gesture when keyguard is active
 2012-06-27 13:33:08 -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
Nick Kralevich
777b598186 Merge "Add mode when open(O_CREAT) is used." 2012-06-27 12:43:38 -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
7decabbe4c am c16f40ae: am fec0c188: Merge "docs: add info about live wallpaper picker" into jb-dev 
* commit 'c16f40aecca3d58aa826fa4b65f3764b963c30d6':
  docs: add info about live wallpaper picker
 2012-06-27 02:18:14 -07:00
Scott Main
c8346adcfe am a31e954f: am b6d148d0: Merge "docs: remove empty page and expand system requirements based on URL hash" into jb-dev 
* commit 'a31e954f0a33e810891c8ce199292c17f85b1e98':
  docs: remove empty page and expand system requirements based on URL hash
 2012-06-27 02:18:10 -07: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
5a62f57d65 am 2c6a762c: am 84ea453c: Merge "Doc change: remove an unneeded file. Edits." into jb-dev 
* commit '2c6a762c1adfd76fd67b521ffed69992eb6245dc':
  Doc change: remove an unneeded file. Edits.
 2012-06-27 01:24:02 -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
8eacc1923b am aaff44ca: am aaecf93b: Merge "Doc change: add diff report for 16." into jb-dev 
* commit 'aaff44ca5a9f01fd3c4b988e477e14a9342a4fd4':
  Doc change: add diff report for 16.
 2012-06-27 01:19:58 -07:00