229344 Commits

Author SHA1 Message Date
Chris Craik
ae10e1368c Merge "Fix clip serialization crash" 2016-01-12 02:14:29 +00:00
Chris Craik
15f046866c Fix clip serialization crash
Can't safely rewind clip allocations, since those pointers are cached by
ClipArea. Instead add early rejection to handle most cases, and update
tests.

Change-Id: Ic32f95cf95602f427f25761a8da1583c4495f36d
2016-01-11 17:54:49 -08:00
Filip Gruszczynski
2e263c4a12 Merge "Deliver onNewIntent before onResume when launching recents." 2016-01-12 01:49:12 +00:00
Filip Gruszczynski
e826f327cf Deliver onNewIntent before onResume when launching recents.
Bug: 25837292
Change-Id: I9da5d2a87c0e33006ef1488dfab5389911955922
2016-01-11 17:47:58 -08:00
Chong Zhang
f2c9628cac Merge "Apply scroll to windows added to a non-resizeble task that's docked" 2016-01-12 01:39:26 +00:00
Chong Zhang
2a88fc31cf Apply scroll to windows added to a non-resizeble task that's docked
bug: 26447921
Change-Id: I933e277137fb127a9e961035cf48cba2bef52042
2016-01-11 17:15:40 -08:00
Chet Haase
fadc86666f Merge "Don't double-set keyframe values when Property exists" 2016-01-12 00:51:36 +00:00
Chet Haase
406a02b59d Don't double-set keyframe values when Property exists
There is logic in PVH.setupValue() that sets the value of
the appropriate keyframe from a Property, if that Property object
exists for the animator. But after that is done, it goes ahead and sets
the same keyframe value based on the getter for the target object.
This is not only redundant; it is wrong (in the odd situation in which
a getter would return something different than Property.get()).

The solution is to return early once we've set the value with the
Property object.

Issue #26471646  PropertyValuesHolder uses reflection in setupValue when a Property is being used

Change-Id: I12634a25661400f13f44872ba17625b32e93ca19
2016-01-11 16:27:20 -08:00
Todd Kennedy
12705131b9 Hide ephemerality
Change-Id: Ibf60366b3f00b1920e330cd804bcc1c550f8882a

Bug: 26404647
2016-01-11 16:21:03 -08:00
Yohei Yukawa
f55ed12fd1 Merge "Enrich JavaDoc for IC#deleteSurroundingText()." 2016-01-12 00:08:39 +00:00
Filip Gruszczynski
7c132d82c5 Merge "Start recents when bringing docked task to the front." 2016-01-11 23:54:00 +00:00
Winson Chung
f273418b07 Merge "Snap docked stack after screen rotation" 2016-01-11 23:44:55 +00:00
Chris Craik
e3dc1fe215 Merge "Rename OpReorderer to FrameReorderer" 2016-01-11 23:44:17 +00:00
Filip Gruszczynski
303210bbdd Start recents when bringing docked task to the front.
We don't want the docked activity to be on top by itself, so we need to
force the recents to come up to.

Bug: 25838525
Change-Id: Icb8184db5cc67e536561674b887bf481595257cc
2016-01-11 15:41:07 -08:00
Chris Craik
5ea1724be4 Rename OpReorderer to FrameReorderer
Also separate LayerReorderer into its own files.

Change-Id: Iafb6a156f760f62f831f6288fd0dadf1db25da24
2016-01-11 15:35:52 -08:00
Steve McKay
da161f0b17 Merge "Fix bug where both list and grid buttons are visible." 2016-01-11 23:33:00 +00:00
Chris Craik
987635710f Merge "Fix path position in BakedOpDispatcher" 2016-01-11 23:13:28 +00:00
George Mount
6b99325be9 Merge "Change access to action bar to control-<" 2016-01-11 23:12:00 +00:00
Jorim Jaggi
737af724eb Snap docked stack after screen rotation
- Move DividerSnapAlgorithm to com.android.internal, also move
some utility stuff into DividerUtils which is used from both
SystemUI and window manager
- When the screen rotation changes, rotate the stacks like before
but then also snap the docked stack to a valid snap position.

Change-Id: I9e1aa13f42f398a25c9016e6f20395ee212e405b
2016-01-11 23:05:56 +00:00
Aga Wronska
d3b8e52009 Merge "Keep Search View visible after search completed Improve Search View behavior Add Search View background color" 2016-01-11 23:05:43 +00:00
Aga Wronska
97831485e7 Keep Search View visible after search completed
Improve Search View behavior
Add Search View background color

Bug:26143355
Change-Id: Ifdc4bfff56fc6244c571dfbeff4179e1515d53b7
2016-01-11 14:58:18 -08:00
Julia Reynolds
04fc35428f Merge "Notification banning updates." 2016-01-11 21:32:37 +00:00
Chris Craik
f9b3678534 Fix path position in BakedOpDispatcher
Change-Id: I73f4bbcf3fe6f5d3fbdf8058b598bb8f1622097c
2016-01-11 13:26:58 -08:00
John Reck
a16a704af0 am 0c7532ff: am e678b41c: Merge "Fix setName use-after-free" into mnc-dev am: 3a79376bb5
am: eee53e6d39

* commit 'eee53e6d3912220abeea3dfd8b305c051b43eb4e':
2016-01-11 21:18:33 +00:00
Wale Ogunwale
29765d04d8 Merge "Fixed NPE in Task#isResizeableByDockedStack" 2016-01-11 21:08:54 +00:00
Wale Ogunwale
5e7409cf6a Fixed NPE in Task#isResizeableByDockedStack
It is possible for the DisplayContent to be null.

Change-Id: I0a85038ae71a24fb5613237d771bc9222dd61cde
2016-01-11 13:07:45 -08:00
Shreyas Basarge
89ee618280 Flex time for periodic jobs in JobScheduler
A periodic job will start only within time
satisfying period - flex < time % period < period.

Bug: 26254850
Change-Id: I97a840446e5592e5151d784800855d909f1790b8
2016-01-11 20:58:29 +00:00
Chong Zhang
db02dc190f Merge "Fix black screen when launching app from Recents into non-docked area" 2016-01-11 20:42:34 +00:00
Chong Zhang
573e8e1706 Fix black screen when launching app from Recents into non-docked area
In this case, we're putting the app into a fullscreen stack that is
resized due to docked stack. When setting up the thumbnail scale up
animation, we have to treat this case as animating into freeform window,
as the containing frame will not be fullscreen, and it's not a clip
rect. For freeform windows, we set up scaling and translation, and
don't change the clip rect.

bug: 26435476
Change-Id: Ic1ac71bfc814afd62572027fa11663c80d903a2d
2016-01-11 12:35:12 -08:00
Philip P. Moltmann
e978af63e6 Merge "Do not add far favorite printers more than once." 2016-01-11 20:22:40 +00:00
Philip P. Moltmann
fcb51b8270 Merge "ApprovedServices might be null, handle the case:" 2016-01-11 20:22:10 +00:00
Winson Chung
42007e34be Merge "Simplifying the task header highlight drawing." 2016-01-11 20:18:47 +00:00
Tingting Wang
9d46b3efd7 Merge "Remove @hide for CONTACT_METADATA_SYNC." 2016-01-11 20:18:37 +00:00
Winson
94a0e89adb Simplifying the task header highlight drawing.
- Removed unused ripple logic in the task header background, simplifying
  the background and highlight drawing
- Calculating the header highlight from the actual task color now
- Preventing some extra work from happening when the task view size
  changes

Change-Id: I775651f4b9ce8c1cdfa6fb3d77fd6912fd99a93b
2016-01-11 20:18:25 +00:00
Winson
ad66efa813 Removing HW layers for task view transitions.
Change-Id: I00377e12d779519bd0fc102480d37382b3ac4ea6
2016-01-11 20:17:16 +00:00
Winson
b94443d876 Fixing regression in initial task bounds animating into Overview.
Change-Id: I09e76c97515dd7e38f8696ac6c48016c9d0a5263
2016-01-11 20:14:03 +00:00
Winson
e6309aa57e Prevent docking via nav bar until user is set up.
- Also prevents docking if screen pinning is currently active.
- Fixes issue where you could go into recents when setting up a 
  secondary user.

Bug: 26438797
Bug: 26316912
Change-Id: I30576b52842b76184ef0b2252bc572f74a5d6db8
2016-01-11 20:13:14 +00:00
Winson
778f495f04 Removing code to animate thumbnail scale now that we animate bounds.
- This CL reverts the code to the previous state where we can just 
  calculate the thumbnail scale from the view bounds.

Change-Id: I156ae915af76055b5177a6bdf0f929bdf6acea01
2016-01-11 20:11:51 +00:00
Jason Monk
2c8eb3e005 Merge "Fix build" 2016-01-11 19:55:53 +00:00
Philip P. Moltmann
8d978ba1e7 Merge "In rare cases the printing client app might have been dieded before remotePrintDocument.start(). In this case the print spooler should not crash." 2016-01-11 19:41:55 +00:00
Philip P. Moltmann
f7b5018028 Merge "Display toast when print services are disabled." 2016-01-11 19:41:25 +00:00
Jason Monk
057ee76e5c Fix build
Fix bad merge

Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577
2016-01-11 14:37:44 -05:00
Jason Monk
c06fbb1298 Move battery saver notification to QS
Remove the battery saver notification and instead create a detail
panel within QS that allows it to be turned on and off.

Change-Id: I54654d26183586fa171fda04877a840701f8ef33
2016-01-11 14:29:23 -05:00
Rob Carr
3d4f83c01f Merge "Implement surfaceRedrawNeeded for GLSurfaceView" 2016-01-11 19:18:25 +00:00
Tingting Wang
e105521736 Remove @hide for CONTACT_METADATA_SYNC.
Make Contacts App access this flag.

BUG 26491409

Change-Id: I440cb540fbcc5dd3722ecb6e335dd40914cc30b5
2016-01-11 11:12:03 -08:00
Jeremy Klein
502658dd90 Merge "Add a TETHER_PRIVILEGED permission and use it where needed." 2016-01-11 19:10:22 +00:00
Jose Lima
246c8e9c79 am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev am: 57b7573210
am: e54704461e

* commit 'e54704461e02437f83ddc7ed432c345d3cec1e9f':
2016-01-11 19:06:42 +00:00
Steve McKay
9fd87f4f4c Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-11 19:05:00 +00:00
Steve McKay
f7ade5d9cc am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
2016-01-11 19:04:00 +00:00
Steve McKay
48bc4bf872 am c05605ae: am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev am: c226801a43
am: 2dbf679cf0

* commit '2dbf679cf080df06e5340ea4bb766ea4f1aa1956':
2016-01-11 19:01:55 +00:00