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

140267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
7901b2a549 Set the default content description for Toolbars acting as action bars 
Bug 15814044

Change-Id: I07c20de1349cb07f21eaf0db718da94c0ba7043d
 2014-06-24 17:32:06 -07:00
Adam Powell
4212d1f2e9 Merge "Inflate fragments from layout into child FragmentManagers" 2014-06-23 21:50:10 +00:00
Adam Powell
371a809179 Inflate fragments from layout into child FragmentManagers 
Previously, if an app inflated a layout in a Fragment's onCreateView
that itself had fragments included, those fragments would be added to
the Activity-level FragmentManager and would not share the same
lifecycle with the fragment it was inflated for. This led to some
nasty management headaches.

If an app targets L or above, add the fragment to the child
FragmentManager of the current fragment when inflated using the
LayoutInflater passed to the parent fragment.

Bug 12763389

Change-Id: Iad4ed7d5df602aea9579bf1503e206fa894630c1
 2014-06-24 12:29:32 -07:00
Chong Zhang
c4e976daa2 Merge "don't select default track if subtitle controller is not present" 2014-06-24 17:32:43 +00:00
Igor Murashkin
5096defdaa camera2: (legacy) Write the JPEG size as part of the blob transport 
This fixes StillCaptureTest#testStillPreviewCombination

Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
 2014-06-24 18:29:18 +00:00
Chong Zhang
7026020398 don't select default track if subtitle controller is not present 
subtitle controller won't be there if app is not using VideoView.

Bug: 15470448
Change-Id: If6724928220a8906bd2199ebc0916a4493092abb
 2014-06-24 10:56:53 -07:00
Igor Murashkin
a296fece2b camera2: Fix cts test StillCaptureTest#testTakePicture 
* Introduce 'fake' metadata for 3A+flash (hardcoded to support nothing)
(will be removed in a later release)

* Open the camera1 device in its own thread, so that the looper it
captures is also our own (and not the main looper)

* Set the picture size based on the size of the JPEG surface outputs

Change-Id: Iaeb5031c6b352115b73d2261a39d65347d75fdc8
 2014-06-24 10:56:26 -07:00
Craig Mautner
3b6e53fc00 Merge "Don't set return to recents on every resume" 2014-06-23 21:50:10 +00:00
Craig Mautner
76e2a765b4 Don't set return to recents on every resume 
Checking for previous task to be the Recents activity every time
through resumeTopActivityLocked() leads to missetting the
mTaskToReturnTo to Recents for Recents. Instead check for
Recents launching a task in moveTaskToFront and startActivity.

Fixes bug 15832448.

Change-Id: Ib64fe26f3fd3fdcd878edafb041928ec02757e63
 2014-06-24 09:05:43 -07:00
Narayan Kamath
3dd5118b8a am 70bf0698: (-s ours) am b20b0629: am 71dfc7e9: Merge "Memory leak in parsePackage" 
* commit '70bf06986a90c21137fc4836aa0e56d68a2ab588':
  Memory leak in parsePackage
 2014-06-24 14:38:39 +00:00
Derek Sollenberger
07126e12cc Cleanup unused includes in the hwui library. 
Change-Id: I94c188403f5fa541e47a03a3bd1c7cf00c29bf4e
 2014-06-24 14:37:07 +00:00
Narayan Kamath
70bf06986a am b20b0629: am 71dfc7e9: Merge "Memory leak in parsePackage" 
* commit 'b20b0629c2ea6a8e1f7bebd0791dd21e545a4605':
  Memory leak in parsePackage
 2014-06-24 14:26:45 +00:00
Narayan Kamath
b20b0629c2 am 71dfc7e9: Merge "Memory leak in parsePackage" 
* commit '71dfc7e9accc1ca3cda52bdf475b03fa2a334e78':
  Memory leak in parsePackage
 2014-06-24 14:21:14 +00:00
Quddus Chong
5444f3cd92 am ed8b77e6: am 300caefb: Merge "docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn." into klp-modular-dev 
* commit 'ed8b77e668dbc8aa4a8c2a108dce98f2900cc5b3':
  docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn.
 2014-06-24 14:00:37 +00:00
Robert Ly
9e2fe9e35d am a5dc5869: am 387891fd: fix resources js bug 
* commit 'a5dc5869ee15607072b402ab65f8accacf4ed4c8':
  fix resources js bug
 2014-06-24 14:00:32 +00:00
smain@google.com
2e9fb2cd1d am 071894a2: am f98b816b: update landing page gif frame to use new style 
* commit '071894a2108780199cd912cccdfe10cda5212be6':
  update landing page gif frame to use new style
 2014-06-24 14:00:27 +00:00
Quddus Chong
ed8b77e668 am 300caefb: Merge "docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn." into klp-modular-dev 
* commit '300caefb0ca877f45f48d4e76bc086672a6f59b6':
  docs: Removing note for app-indexing developer early adopters from training class, since this feature is going to be publically accessible starting in GMS Longhorn.
 2014-06-24 13:55:09 +00:00
Robert Ly
a5dc5869ee am 387891fd: fix resources js bug 
* commit '387891fde61a63c98ac3a81a5a0d1d7151a95d1f':
  fix resources js bug
 2014-06-24 13:55:05 +00:00
smain@google.com
071894a210 am f98b816b: update landing page gif frame to use new style 
* commit 'f98b816b936ee0beb07a66caee2cf0e3e3bed9ce':
  update landing page gif frame to use new style
 2014-06-24 13:55:01 +00:00
Narayan Kamath
152d5cd30b am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune." 
* commit '22a32d883794a7a96ff5ffb4830ea59065b3ebda':
  Explicitly list out the list of cache subdirs to prune.
 2014-06-24 12:19:10 +00:00
Narayan Kamath
22a32d8837 am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune." 
* commit '2a0f9e6a523abc28bdbc249010f5ddd184a27730':
  Explicitly list out the list of cache subdirs to prune.
 2014-06-24 12:14:12 +00:00
Narayan Kamath
816cff12e1 am c141ae54: am 989ab6d3: Merge "Update javadoc for android.os.Bundle." 
* commit 'c141ae547e9b295ce9013591a6fbb902b0e40073':
  Update javadoc for android.os.Bundle.
 2014-06-24 10:18:23 +00:00
Narayan Kamath
c141ae547e am 989ab6d3: Merge "Update javadoc for android.os.Bundle." 
* commit '989ab6d38d77c0a1f7dc5e648e1950410d5d01d4':
  Update javadoc for android.os.Bundle.
 2014-06-24 10:08:52 +00:00
Stephen Hines
ed24d3f2e9 am db3bcfb8: am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 
* commit 'db3bcfb8f7c1f148bc89eea663ba5aa6fc0ece2f':
  We need to update mPos when we copy a FieldPacker via its data[] member.
 2014-06-24 09:26:31 +00:00
Stephen Hines
db3bcfb8f7 am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 
* commit '44023a4f20a38ed892a6181765337635d77b1de8':
  We need to update mPos when we copy a FieldPacker via its data[] member.
 2014-06-24 06:53:18 +00:00
Narayan Kamath
2a0f9e6a52 Merge "Explicitly list out the list of cache subdirs to prune." 2014-06-24 06:33:30 +00:00
Narayan Kamath
71dfc7e9ac Merge "Memory leak in parsePackage" 2014-06-24 06:22:45 +00:00
Narayan Kamath
989ab6d38d Merge "Update javadoc for android.os.Bundle." 2014-06-24 06:22:45 +00:00
Stephen Hines
44023a4f20 Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 2014-06-24 00:37:45 +00:00
Stephen Hines
fcb3161e57 We need to update mPos when we copy a FieldPacker via its data[] member. 
Bug: 15756600

This change also adds a TODO/FIXME related to subAlign() and our tracking
mechanism for it. We need to further investigate how to make subAlign() work
properly if a user copies their FieldPacker.

Change-Id: I861e529abd11e378f7c73b510d7f418b940fe480
 2014-06-23 17:35:04 -07:00
Robert Greenwalt
6ca5129d80 am a77d0ef4: (-s ours) am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit 'a77d0ef49e8c4b53e1cd794c0739584914bd6eda':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:10:37 +00:00
Robert Greenwalt
a77d0ef49e am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function" 
* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function
 2014-06-23 22:02:12 +00:00
Robert Greenwalt
0b57289678 Merge "DO NOT MERGE refactor wifi p2p's startDhcpServer function" 2014-06-23 21:56:07 +00:00
Marco Nelissen
909a1b2e73 am c4d37f58: am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit 'c4d37f58a1b5405812eaf96b4bd3a051d86884eb':
  Fix thumbnail bug
 2014-06-23 21:51:38 +00:00
Marco Nelissen
c4d37f58a1 am 0eee8ac2: Merge "Fix thumbnail bug" 
* commit '0eee8ac275927264f766bb18023365e83d4bfe5a':
  Fix thumbnail bug
 2014-06-23 21:45:30 +00:00
Christoph Studer
775a159e80 Merge "Remove suppression of ZEN'd notifications" 2014-06-23 21:44:43 +00:00
Christoph Studer
6cb9e0f1f9 Remove suppression of ZEN'd notifications 
Bug: 15286335
Change-Id: I3114d7bcd8f05ca3a58f3598b95fdb507f6c646c
 2014-06-24 17:18:20 +02:00
Christoph Studer
e71fefcc8b Remove notification APIs from StatusBar service 
Bug: 15324972
Bug: 15436573
Change-Id: I838370a23fb07cb876e08c41ef11653f2658719e
 2014-06-24 16:47:56 +02:00
George Mount
16ffa8d3ef Merge "Use Property for ofFloat with Path." 2014-06-23 21:44:43 +00:00
Narayan Kamath
67565a09f5 am 152d5cd3: am 22a32d88: am 2a0f9e6a: Merge "Explicitly list out the list of cache subdirs to prune." 
* commit '152d5cd30bdfd88b0903b205d38c6966cbded5a8':
  Explicitly list out the list of cache subdirs to prune.
 2014-06-24 12:32:50 +00:00
Narayan Kamath
b3af535ade resolved conflicts for merge of 816cff12 to master 
Change-Id: I33990232771138dcf91f55c7cde6bbfe40612b8f
 2014-06-24 13:02:49 +01:00
Stephen Hines
71b676bc95 am ed24d3f2: am db3bcfb8: am 44023a4f: Merge "We need to update mPos when we copy a FieldPacker via its data[] member." 
* commit 'ed24d3f2e991906973afce8aa6a3fa54f4a3e4df':
  We need to update mPos when we copy a FieldPacker via its data[] member.
 2014-06-24 10:38:45 +00:00
Deepanshu Gupta
091208709a am 699f7221: Merge "Temporarily change PorterDuff mode MULTIPLY to SRC_IN" into lmp-preview-dev 
* commit '699f7221dc0719b1ceb03a03183dc742a5bcdf3c':
  Temporarily change PorterDuff mode MULTIPLY to SRC_IN
 2014-06-24 10:33:55 +00:00
Deepanshu Gupta
d8ef316f1f am 91977396: Merge "Fix bug to render status bar icons" into lmp-preview-dev 
* commit '9197739603eb34df6cbc85c6a7fa0ea359e4776b':
  Fix bug to render status bar icons
 2014-06-24 10:33:49 +00:00
Deepanshu Gupta
09348a10be am 3a812f47: Merge "Fix NPE in Ninepatch creation." into lmp-preview-dev 
* commit '3a812f4755015a7384a8d28bbdeca445c87598b3':
  Fix NPE in Ninepatch creation.
 2014-06-24 10:33:44 +00:00
Deepanshu Gupta
2b46b7eed7 am cd4b38ea: Merge "Resource resolution bug fix." into lmp-preview-dev 
* commit 'cd4b38ea1d3605e0e62e5ddc70c052e221fef73c':
  Resource resolution bug fix.
 2014-06-24 10:33:38 +00:00
Deepanshu Gupta
08b59fcb21 am 04703acd: Merge "Add navigtaion bar icons to simulate older platforms." into lmp-preview-dev 
* commit '04703acdd214cd17aaf5757da75a862fb1797d1e':
  Add navigtaion bar icons to simulate older platforms.
 2014-06-24 10:33:33 +00:00
Deepanshu Gupta
3510c58ad6 am e558d180: Merge "LayoutLib: Support PorterDuffColorFilter" into lmp-preview-dev 
* commit 'e558d1806b29385aa14ba60f18e103e2c9aeef1b':
  LayoutLib: Support PorterDuffColorFilter
 2014-06-24 10:33:26 +00:00
Deepanshu Gupta
e2f83fac78 am 52abbced: Merge "Fix SurfaceView in LayoutLib." into lmp-preview-dev 
* commit '52abbced58ace68f8a91c4d092061d115af3b268':
  Fix SurfaceView in LayoutLib.
 2014-06-24 10:33:21 +00:00
Chris Wren
9856739cb0 am 7d165c5d: Update javadocs for heads up behavior. 
* commit '7d165c5d59b6afb6aa66999ff76b79c8017ad09a':
  Update javadocs for heads up behavior.
 2014-06-24 10:33:07 +00:00