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

79728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
cc03b048b9 merge in jb-release history after reset to jb-dev 2012-06-27 14:08:26 -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
Andreas Huber
2ac3f2e285 Minor corrections to the javadoc overview to reflect late API changes. 
Change-Id: If64e7ea0fa9c892d728282e5e18547a4da115989
 2012-06-27 11:46:21 -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
Scott Main
3fd21b562c docs: add info about live wallpaper picker 
Change-Id: Idc11d9f091117dec53b19b352d24e97dab2c4bd0
 2012-06-26 22:17:10 -07:00
Scott Main
882c97b59a am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev 
* commit 'cdb3f9c45b97a64380f044c6b8c1863c1ba58b6a':
  docs: add api overview for jb
 2012-06-26 21:56:17 -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
ea53ebc8dd am aa16a2e0: Merge "docs: remove graphics rs docs and restructure existing docs" into jb-dev 
* commit 'aa16a2e055737869609ce52e563b9175607ae52d':
  docs: remove graphics rs docs and restructure existing docs
 2012-06-26 18:01:36 -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
1524e62506 am 7017d51e: Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev 
* commit '7017d51e147a0f6ed2370fb79c656c9726304131':
  MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes
 2012-06-26 16:59:07 -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
32ef7ef6c8 am 947ce39e: Merge "docs: add landing for gcm" into jb-dev 
* commit '947ce39e5648851a5a49e71e22d187402ff1337d':
  docs: add landing for gcm
 2012-06-26 16:55:52 -07:00
Scott Main
947ce39e56 Merge "docs: add landing for gcm" into jb-dev 2012-06-26 16:53:44 -07:00
Joe Fernandez
bcfeefa094 am 3632af39: Merge "docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1" into jb-dev 
* commit '3632af395c26951393f7e5289510c701c8d9f00b':
  docs: Android SDK r20 Release Notes - cherypick from dac-dev - Change-Id: I696dd125e04c8edb23ed88f8639af3b556c0b0e1
 2012-06-26 16:47:28 -07:00
Joe Fernandez
3e975309bf am 623898f0: Merge "docs: GL Tracer, Device Monitor Tools for SDK r20" into jb-dev 
* commit '623898f099d8ab99f638fbd8062f3c227800fdf5':
  docs: GL Tracer, Device Monitor Tools for SDK r20
 2012-06-26 16:47:26 -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
2e8295ce18 am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev 
* commit '3bb98aec9344af1299b90d1567b4443e4d50cc91':
  Fix issue #6730064: When turning off Nakasi, it very often...
 2012-06-26 16:38:00 -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