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

108898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Adam Powell
0d21c220dd Merge "Fix ListMenuItemView regression from patch 8933efd49" 2013-07-10 19:07:15 +00:00
Chris Craik
a582d06486 Merge "Remove NearestImageView from CanvasCompare" 2013-07-10 19:06:41 +00:00
Adam Powell
c39451267b Fix ListMenuItemView regression from patch 8933efd49 
Passing 'true' as the third parameter of LayoutInflater#inflate does
cause it to add the inflated view to the parent in a single step, but
it also changes the return value to be the root of the resulting
hierarchy after the add rather than the root of the inflated layout.

Return to adding the view to its parent as a separate step.

Bug 9754101

Change-Id: I7ca4c921993594931f5007af69d45e9ff06065df
 2013-07-10 11:51:33 -07:00
Dianne Hackborn
8ce24f2a68 Merge "Add new location monitoring op, make some of app ops public." 2013-07-10 18:45:34 +00:00
Chet Haase
3b5f59dbb7 Merge "Remove unnecessary drawable code in CompoundButton" 2013-07-10 18:32:16 +00:00
Andy McFadden
e68720ee15 Merge "Minor fixes to android.graphics.Matrix" 2013-07-10 16:44:40 +00:00
Chet Haase
7df754e712 Remove unnecessary drawable code in CompoundButton 
Some of the code in setButtonDrawable() was unnecessary, resetting
the button drawable state and then refreshing it. This caused many redundant
calls, which can add up, especially during inflation.

Change-Id: I873cf5eef697b5435a1b827cd68e5d836ee25124
 2013-07-10 07:46:24 -07:00
Chris Craik
a2d519e03b Remove NearestImageView from CanvasCompare 
Change-Id: I69b0539df704d80a34cc8f22096657210f5d78ad
 2013-07-09 19:22:37 -07:00
Romain Guy
68389dee4e Merge "Unregister gralloc buffer immediately Bug #9406765" 2013-07-10 02:00:22 +00:00
Romain Guy
b2ed04a689 Unregister gralloc buffer immediately 
Bug #9406765

Waiting for a GC to finalize the GraphicBuffer could cause ordering
issues

Change-Id: I7035a9eef52a6c3b44ab28f40a7b1fbdc83d2e20
 2013-07-09 18:56:57 -07:00
Dianne Hackborn
1304f4ae32 Add new location monitoring op, make some of app ops public. 
The new location monitoring op is to tell us when an application
is monitoring for any location changes.  It may be useful information
in addition to the more explicitly information about when location
data actually goes to the app.

Also make parts of AppOpsManager public for use by gcore.  It is
not available to third party apps.

Change-Id: Ib639f704258ffdd7f3acd7567350ed2539da628a
 2013-07-09 18:17:27 -07:00
Andy McFadden
73b81e75df Minor fixes to android.graphics.Matrix 
Tweaked equals() and finalize(), introduced trivial hashCode().

(Also picked up a handful of automatic trailing-space removals.)

Bug 9756081

Change-Id: I4639cf1e970a16179fa6c0d24785f4d0dfbe58ed
 2013-07-09 16:45:20 -07:00
Elliott Hughes
dff4ec87e7 am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master 
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.
 2013-07-09 15:28:51 -07:00
Elliott Hughes
e16a21c6b4 resolved conflicts for merge of 4a59376d to stage-aosp-master 
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
 2013-07-09 15:25:23 -07:00
Elliott Hughes
4a59376d5e Merge "Track libcore API change." 2013-07-09 22:08:36 +00:00
Craig Mautner
5eda9b3301 Add convertToTranslucent to API. 
Rename convertToOpaque to convertFromTranslucent. Add the
counterpart to Activity.convertFromTranslucent() for returning from
opaque to a translucent Activity. The caller should wait until
TranslucentConversionListener.onTranslucentConversionComplete() is
called before actually changing the background to translucent.

Change-Id: Id04b026bcc4dd8bad9a33a7af126e1bb28fb9c03
 2013-07-09 14:50:12 -07:00
Elliott Hughes
befd0b1bdf Track libcore API change. 
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
 2013-07-09 14:46:18 -07:00
Jean-Baptiste Queru
4d380d71e0 am fb231fea: am 425729f9: Merge "Empty commit" 
* commit 'fb231fea6cd4dac7323b1df74006b294c3c9bfef':
  Empty commit
 2013-07-09 14:41:07 -07:00
Jean-Baptiste Queru
fb231fea6c am 425729f9: Merge "Empty commit" 
* commit '425729f92afc401f497e25b54460b1de8931c52e':
  Empty commit
 2013-07-09 14:39:29 -07:00
Jean-Baptiste Queru
425729f92a Merge "Empty commit" 2013-07-09 21:37:50 +00:00
Jean-Baptiste Queru
3ea7fe3054 Empty commit 
Work around a Gerrit issue.

Change-Id: If118caca3e9264f7dd88e554bb9d3cd219cb18bf
 2013-07-09 14:34:06 -07:00
Craig Mautner
607c6e2a56 Merge "Refactor ActivityThread cache - Baby step 1." 2013-07-09 20:25:16 +00:00
Vinit Deshapnde
ada2f7e17b Merge "Flush scan results et al after band change" 2013-07-09 19:20:24 +00:00
Amith Yamasani
235e817c80 Merge "Clean up any restrictions files that shouldn't be there." 2013-07-09 18:32:41 +00:00
Amith Yamasani
b82add27d0 Clean up any restrictions files that shouldn't be there. 
Partially fixes the mess that was caused by #9681399

Change-Id: Iaabe15c87d1b002f0b2210b34adcc31b8fb4329c
 2013-07-09 11:24:44 -07:00
Scott Main
df541931f9 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 'c4570b32d87079a5ff81262c1646fa0301b7f3b9':
  update url for backup service key bug: 8834302
 2013-07-09 10:58:43 -07:00
Dirk Dougherty
5fc1e8a33d 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 'ec47cc7724464f0ce88456462cbd69aca9a6838e':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:58:40 -07:00
Scott Main
c4570b32d8 am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '29282f99252237dd9674737d26ce72afbfdd3ac1':
  update url for backup service key bug: 8834302
 2013-07-09 10:56:35 -07:00
Dirk Dougherty
ec47cc7724 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 '0f97f3510bbef333887440b6f0bc65aea2352597':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:56:32 -07:00
Scott Main
29282f9925 am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'b1b693eec6e171a059190e6f17ff53b8c558cbb3':
  update url for backup service key bug: 8834302
 2013-07-09 10:54:18 -07:00
Dirk Dougherty
0f97f3510b am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'cfb8f9a07681cc090428a47aa856cba51be29ce5':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:54:13 -07:00
Scott Main
b1b693eec6 am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '5e0582cc0e09a209bed321323ad9dad3ca51dcb1':
  update url for backup service key bug: 8834302
 2013-07-09 10:52:44 -07:00
Dirk Dougherty
cfb8f9a076 am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '3059c70844848c7bd1aad7bffd2d5828cf745540':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:52:40 -07:00
Scott Main
5e0582cc0e am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '7cf27aa8e3fe4735d1cf787917a524e472376e6e':
  update url for backup service key bug: 8834302
 2013-07-09 10:51:18 -07:00
Dirk Dougherty
3059c70844 am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'd5fee1644ec9829400dda77c650694f41c5decc3':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:51:15 -07:00
Scott Main
7cf27aa8e3 Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 2013-07-09 17:50:44 +00:00