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

108944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
6b217a4d2a Merge "Trace bitmaps decoding" 2013-07-12 00:41:24 +00:00
Romain Guy
787e35793f Trace bitmaps decoding 
Also remove dead code

Change-Id: Ie931b21858ccbe6ee4def54caf028fd2aed23317
 2013-07-11 17:37:31 -07:00
Robert Greenwalt
d76a6851a8 am 6f2b31fc: am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:12:35 -07:00
Robert Greenwalt
6f2b31fcf5 am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '56a7e4ad43eb5288a80b34566db365aaaa845e87':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:09:14 -07:00
Robert Greenwalt
56a7e4ad43 am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 
* commit '116d46659889f588fa9ffa5e1bc4dda90067fce6':
  Block Wifi P2p discovery while doing dhcp.
 2013-07-11 17:07:06 -07:00
Robert Greenwalt
116d466598 Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 2013-07-12 00:04:45 +00:00
Scott Main
dd893b9db3 am 330cf2f7: am 7afc5ca3: am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '330cf2f7ffc619d51bce7901590c33adc4b0c863':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:53:19 -07:00
Scott Main
330cf2f7ff am 7afc5ca3: am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '7afc5ca353c9b4a3839c988fe6c281289495a18a':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:50:57 -07:00
Scott Main
7afc5ca353 am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:47:53 -07:00
Scott Main
57b0fed7a9 am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:44:58 -07:00
Scott Main
603c3d8a9a am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:42:47 -07:00
Scott Main
3e82a9c9a5 am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '276f0ce4df7f58786da08c34f548456129144aed':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:40:11 -07:00
Scott Main
276f0ce4df update Android Studio for v0.2.0. 
add release notes and troubleshooting topics

Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
 2013-07-11 16:22:21 -07:00
Adam Powell
639f37e7ab Merge "Un-hide all ViewParent methods" 2013-07-11 22:50:38 +00:00
Adam Powell
504a10f2f5 Un-hide all ViewParent methods 
Make it possible for code outside the framework to implement the
ViewParent interface.

Change-Id: Ic1b4eb15a4b3da1d16c92b59e039d89861d893e4
 2013-07-11 15:25:59 -07:00
Geremy Condra
1df62d2783 Merge "Permissions to protect socket marking settings" 2013-07-11 22:25:14 +00:00
Igor Murashkin
aec59fa0c8 Merge "camera2 api: Add CameraMetadata get/set support" 2013-07-11 22:17:38 +00:00
Jeff Sharkey
84b2dd8927 am df04f644: am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'df04f64434f3310d3eb71d332935616fcdc497a2':
  Recover from corrupt network stats.
 2013-07-11 14:23:28 -07:00
Igor Murashkin
b519cc52ec camera2 api: Add CameraMetadata get/set support 
* Add a Rational class
* Can get/set Key<T> where T is a primitive (or Rational)
* Can get/set Key<T> where T is a primitive array
* Can get/set Key<T> where T is an enum (synthetic constructor only)

Not implemented yet:
* When T is anything else, i.e. Rect, Size, etc

Bug: 9529161
Change-Id: I64438024a1e8327a38dd2672652626f0ffbb70e3
 2013-07-11 13:06:56 -07:00
John Spurlock
b1d985dee0 Merge "Resolve car dock home activities properly." 2013-07-11 19:30:14 +00:00
Baligh Uddin
894ff8922e Merge "Import translations. DO NOT MERGE" 2013-07-11 18:55:30 +00:00
Baligh Uddin
45544136f5 Merge "Import translations. DO NOT MERGE" 2013-07-11 18:53:28 +00:00
Baligh Uddin
4301744539 Merge "Import translations. DO NOT MERGE" 2013-07-11 18:53:01 +00:00
Jeff Sharkey
df04f64434 am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
  Recover from corrupt network stats.
 2013-07-11 11:41:24 -07:00
Jeff Sharkey
f8b692754f am 1f99a483: Recover from corrupt network stats. 
* commit '1f99a483e410811473b12d8efedd79c738df7af3':
  Recover from corrupt network stats.
 2013-07-11 11:38:50 -07:00
Romain Guy
a7691a47fe Merge "Trace list view items management" 2013-07-11 18:19:24 +00:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 11:18:53 -07:00
Robert Greenwalt
6433ef2900 Block Wifi P2p discovery while doing dhcp. 
bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
 2013-07-11 11:10:08 -07:00
The Android Open Source Project
6b0693a318 am 8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit '8f4e09d2a8213d64edacc081879aaadd56b961bc':
 2013-07-11 10:17:23 -07:00
Elliott Hughes
8964b3bb3d am f445a685: am 0b18c149: am 0f50cb31: Merge "Fix build." 
* commit 'f445a6856777cdcbec14342c2a3510b26ea7b675':
  Fix build.
 2013-07-11 10:17:12 -07:00
The Android Open Source Project
180535015d am f51538f4: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'f51538f444ca9448d194cf184af4fd8f0554d723':
  Revert "Stop marking gamepads as keyboards"
  Revert "Temporarily disable 'Scan Always' mode"
 2013-07-11 10:17:04 -07:00
Elliott Hughes
a7ac8be1f5 am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master 
* commit 'dff4ec87e7b942b7b4410f639fc74c2cffb386d6':
  Track libcore API change.
 2013-07-11 10:16:46 -07:00
Jean-Baptiste Queru
11396cfd6f am 4d380d71: am fb231fea: am 425729f9: Merge "Empty commit" 
* commit '4d380d71e06781314b052ea71ef20ed6511e560f':
  Empty commit
 2013-07-11 10:16:36 -07:00
Scott Main
792dd4c0e4 am df541931: am c4570b32: am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'df541931f989d0421c38bea6bca7065bd7d4a292':
  update url for backup service key bug: 8834302
 2013-07-11 10:08:20 -07:00
Dirk Dougherty
3f96f70f9a am 5fc1e8a3: am ec47cc77: am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '5fc1e8a33d816036a56abcee8eaefaeef2ea24e4':
  docs: add link to developer survey on main landing pages
 2013-07-11 10:08:17 -07:00
Satoshi Kataoka
713412fd54 am 7e0fad1d: am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 
* commit '7e0fad1d442428b9a2ba5d88ce7f8a59869acb0e':
  Revert "Stop marking gamepads as keyboards"
 2013-07-11 08:08:18 -07:00
Joe Malin
471fb03d46 am fc13329b: am 216e340b: am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'fc13329b8430a62c02f7109e1b7cf0abcaa896ee':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-11 08:08:14 -07:00
The Android Open Source Project
c6f681d131 am b2bc3331: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 
* commit 'b2bc33315824ee880b319a2eb69018dc44d1026e':
 2013-07-11 08:08:06 -07:00
John Spurlock
f56bef147d Resolve car dock home activities properly. 
Look up the actual user id (package manager does not understand
UserHandle.USER_CURRENT) and return metadata during resolution
for subsequent checking.

Bug: 9738229
Change-Id: Ib060bacc84473b27a1fb2e717651dc84f018d6f9
 2013-07-11 11:00:26 -04:00
Ben Murdoch
e3f9071e0d Plumb View.getAccessibilityNodeProvider though WebViewProvider. 
This is needed to make use of the new Accessibility implementation
in the Chromium WebView. nos for WebView Classic.

Change-Id: I96bd2426d2de3b26dc9b72d0fdbacefa9bbe20f7
 2013-07-11 14:41:46 +01:00
Dianne Hackborn
9865ef1ba5 Merge "Add -c option to meminfo to dump a compact form." 2013-07-11 02:03:33 +00:00
Dianne Hackborn
20cdcee47d Add -c option to meminfo to dump a compact form. 
Also fix a bug in FastPrintWriter where println(long) was
not printing the newline.

Change-Id: Idcb4eaab0c1ec4b992032b5e36478ef11a6533d9
 2013-07-10 18:47:04 -07:00
Baligh Uddin
cbc9afdcd5 Import translations. DO NOT MERGE 
Change-Id: I3560b16b347b71c61ad1f723d444dbd056ee0d8f
Auto-generated-cl: translation import
 2013-07-10 18:41:54 -07:00
Baligh Uddin
634c1cc6f8 Import translations. DO NOT MERGE 
Change-Id: Ie5e451abf345a2dea6e4f970b24166f1ba7e205d
Auto-generated-cl: translation import
 2013-07-10 18:24:25 -07:00
Baligh Uddin
08f8a810d9 Import translations. DO NOT MERGE 
Change-Id: I3f2d4b1f5d1ca4bb1f3c0e04757a627ad52ae365
Auto-generated-cl: translation import
 2013-07-10 18:08:48 -07:00
Romain Guy
5fade8c69a Trace list view items management 
Change-Id: If43ce115679c2bcacad26d6f59e3bfb655abff6e
 2013-07-10 16:40:30 -07:00
Craig Mautner
fb20eb48aa Merge "Add convertToTranslucent to API." 2013-07-10 21:52:28 +00:00
Chet Haase
47e36c3cfe Merge "Fix minor transition bugs" 2013-07-10 20:00:15 +00:00
Kenny Root
3b4d69508a Merge "KeySetManager: convert comments to Javadoc" 2013-07-10 19:35:49 +00:00
Chet Haase
dc57d9dda5 Fix minor transition bugs 
TransitionGroup.setDuration() was not propagating the new duration to
future child transitions correctly.

Also, Fade should restore a fully-opaque value when a transition ends, to prevent
the problem of mid-stream canceled transitions causing vie3ws to get stuck with partially
faded-in alpha values.

Issue #9755995 Transitions: TransitionGroup.setDuration() not handled correctly
Issue #9756655 Transitions: handle fading cancelation better

Change-Id: Id44569c6f4152a26ee382d04c30a2f035a1ebcf3
 2013-07-10 12:14:54 -07:00