OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Use visible window bounds to determine if a point is within a task"
Wale Ogunwale [Tue, 6 Oct 2015 19:41:05 +0000 (19:41 +0000)]
Merge "Use visible window bounds to determine if a point is within a task"

8 years agoMerge "Make window callbacks non static member of ViewRootImpl"
Chong Zhang [Tue, 6 Oct 2015 18:56:13 +0000 (18:56 +0000)]
Merge "Make window callbacks non static member of ViewRootImpl"

8 years agoUse visible window bounds to determine if a point is within a task
Wale Ogunwale [Tue, 6 Oct 2015 18:08:28 +0000 (11:08 -0700)]
Use visible window bounds to determine if a point is within a task

We need to use the visible frame on the window for any touch-related
tests. Can't use the task's bounds because the original task bounds
might be adjusted to fit the content frame. For example, the presence
of the IME adjusting the windows frames when the app window is the
IME target.

Bug: 24680002
Change-Id: Id73453788d56de879410027531ddefa46d929c67

8 years agoMerge "Reduce CascadingMenuPopup's reliance on internal ListView state"
Alan Viverette [Tue, 6 Oct 2015 18:43:24 +0000 (18:43 +0000)]
Merge "Reduce CascadingMenuPopup's reliance on internal ListView state"

8 years agoMerge "Clean up legacy colors"
Alan Viverette [Tue, 6 Oct 2015 18:19:19 +0000 (18:19 +0000)]
Merge "Clean up legacy colors"

8 years agoMerge "Add animation and positional stability to intent chooser UI"
Adam Powell [Tue, 6 Oct 2015 18:14:02 +0000 (18:14 +0000)]
Merge "Add animation and positional stability to intent chooser UI"

8 years agoMake window callbacks non static member of ViewRootImpl
Chong Zhang [Tue, 6 Oct 2015 17:26:00 +0000 (10:26 -0700)]
Make window callbacks non static member of ViewRootImpl

Move add/removeWindowCallbacks to onAttachedToWindow/onDetachedFromWindow.

There might be more than one windows in an app process, the window
callbacks need to be per window, not global.

bug: 24679461
Change-Id: I216ff27b2a41ecfe7399a8161df362bebc0ac96a

8 years agoClean up legacy colors
Alan Viverette [Tue, 6 Oct 2015 17:29:05 +0000 (13:29 -0400)]
Clean up legacy colors

Change-Id: I8922ae87c65b130c46ea34e41fd31d9fe6b92799

8 years agoMerge "Reduce, reuse, recycle SNAPSHOTS!"
John Reck [Tue, 6 Oct 2015 17:24:48 +0000 (17:24 +0000)]
Merge "Reduce, reuse, recycle SNAPSHOTS!"

8 years agoReduce, reuse, recycle SNAPSHOTS!
John Reck [Tue, 6 Oct 2015 17:06:37 +0000 (10:06 -0700)]
Reduce, reuse, recycle SNAPSHOTS!

Shaves like, 1 whole us off of reset

Change-Id: I459370448583d5e22fd302ba1353319564a814be

8 years agoMerge "Make activities trageting SDK N or greater resizeable by defualt"
Wale Ogunwale [Tue, 6 Oct 2015 17:12:24 +0000 (17:12 +0000)]
Merge "Make activities trageting SDK N or greater resizeable by defualt"

8 years agoMerge "Hide VPN "settings" button when VPN is restricted"
Robin Lee [Tue, 6 Oct 2015 16:27:40 +0000 (16:27 +0000)]
Merge "Hide VPN "settings" button when VPN is restricted"

8 years agoMake activities trageting SDK N or greater resizeable by defualt
Wale Ogunwale [Tue, 6 Oct 2015 03:18:27 +0000 (20:18 -0700)]
Make activities trageting SDK N or greater resizeable by defualt

Also, removed condition that prevented activity from setting
device orientation if it is resizeable. We only need to prevent
it from affecting the orientation when it isn't fullscreen and
not all the time. Work is being tracked in bug 24685213.

Bug: 19865400
Change-Id: I9e1ea77c6acd13801a06f791e0b8859fbcb0f15c

8 years agoMerge "Prevent apps from affecting device orientation in freeform or docked mode"
Wale Ogunwale [Tue, 6 Oct 2015 15:36:47 +0000 (15:36 +0000)]
Merge "Prevent apps from affecting device orientation in freeform or docked mode"

8 years agoPrevent apps from affecting device orientation in freeform or docked mode
Wale Ogunwale [Tue, 6 Oct 2015 04:15:00 +0000 (21:15 -0700)]
Prevent apps from affecting device orientation in freeform or docked mode

Bug: 24685213
Change-Id: I656670dab52196ba736ddffae658685413d70739

8 years agoMerge "Refactoring: Remove unused parameter from topRunningActivityLocked."
Filip Gruszczynski [Tue, 6 Oct 2015 15:07:22 +0000 (15:07 +0000)]
Merge "Refactoring: Remove unused parameter from topRunningActivityLocked."

8 years agoHide VPN "settings" button when VPN is restricted
Robin Lee [Tue, 6 Oct 2015 14:58:30 +0000 (15:58 +0100)]
Hide VPN "settings" button when VPN is restricted

Opening Settings will just launch an empty, grayed-out page in this
case.

Bug: 24674409
Change-Id: I382f1add965c104d7d93443678c0e4b67fd55ad8

8 years agoMerge "Added SDK version code for N."
Wale Ogunwale [Tue, 6 Oct 2015 14:40:41 +0000 (14:40 +0000)]
Merge "Added SDK version code for N."

8 years agoReduce CascadingMenuPopup's reliance on internal ListView state
Alan Viverette [Tue, 6 Oct 2015 14:40:25 +0000 (10:40 -0400)]
Reduce CascadingMenuPopup's reliance on internal ListView state

Bundles cascading menu information and stores it in a stack representing
the hierarchy of added menus.

Bug: 23970448
Change-Id: Icc0a96ea2dd4320fd4dae9626435ed82a6165480

8 years agoMerge "Send status of Surface performance tests."
Yury Khmel [Tue, 6 Oct 2015 07:52:10 +0000 (07:52 +0000)]
Merge "Send status of Surface performance tests."

8 years agoRefactoring: Remove unused parameter from topRunningActivityLocked.
Filip Gruszczynski [Tue, 6 Oct 2015 05:48:30 +0000 (22:48 -0700)]
Refactoring: Remove unused parameter from topRunningActivityLocked.

Change-Id: I350e9459af13858e4ed95fe6511383266f509cb8

8 years agoam 05f88187: am ab8616cf: am 235a6911: am 714a61cd: Merge "Ambient display now comes...
Selim Cinek [Tue, 6 Oct 2015 02:22:53 +0000 (02:22 +0000)]
am 05f88187: am ab8616cf: am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev

* commit '05f88187463119d59955a77c463075e4b12adbc2':
  Ambient display now comes up immediately when a notification comes in

8 years agoam ab8616cf: am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediatel...
Selim Cinek [Tue, 6 Oct 2015 02:17:58 +0000 (02:17 +0000)]
am ab8616cf: am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev

* commit 'ab8616cf183cd408039be394fee709f4e0ee1303':
  Ambient display now comes up immediately when a notification comes in

8 years agoam 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a...
Selim Cinek [Tue, 6 Oct 2015 02:11:51 +0000 (02:11 +0000)]
am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev

* commit '235a6911b0939adc598e4135e1f1c6fcda9ff169':
  Ambient display now comes up immediately when a notification comes in

8 years agoam 714a61cd: Merge "Ambient display now comes up immediately when a notification...
Selim Cinek [Tue, 6 Oct 2015 02:06:20 +0000 (02:06 +0000)]
am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev

* commit '714a61cd586c789b18acfd0567cfea2b4ea170dd':
  Ambient display now comes up immediately when a notification comes in

8 years agoMerge "Ambient display now comes up immediately when a notification comes in" into...
Selim Cinek [Tue, 6 Oct 2015 01:59:50 +0000 (01:59 +0000)]
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev

8 years agoMerge "Do not bring home stack to front when removing non-focused stack"
Chong Zhang [Tue, 6 Oct 2015 01:39:07 +0000 (01:39 +0000)]
Merge "Do not bring home stack to front when removing non-focused stack"

8 years agoam ce8fc7b9: am 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi...
Adam Lesinski [Tue, 6 Oct 2015 01:19:50 +0000 (01:19 +0000)]
am ce8fc7b9: am 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev

* commit 'ce8fc7b919dbe6209ae4ac747179e33ec1ae8f9a':
  Add anydpi to the providing-resources docs

8 years agoMerge "Use app compat theme for DocsActivity."
Ben Kwa [Tue, 6 Oct 2015 01:13:25 +0000 (01:13 +0000)]
Merge "Use app compat theme for DocsActivity."

8 years agoam 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providin...
Adam Lesinski [Tue, 6 Oct 2015 01:11:20 +0000 (01:11 +0000)]
am 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev

* commit '42efe5b333c1f28127da57a44b39bd72cfbe81b2':
  Add anydpi to the providing-resources docs

8 years agoam c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources...
Adam Lesinski [Tue, 6 Oct 2015 01:03:49 +0000 (01:03 +0000)]
am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev

* commit 'c87996e5382a5e9bc4ae400e1879d7c655d8b46a':
  Add anydpi to the providing-resources docs

8 years agoam 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into...
Adam Lesinski [Tue, 6 Oct 2015 00:57:43 +0000 (00:57 +0000)]
am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev

* commit '8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
  Add anydpi to the providing-resources docs

8 years agoam 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
Adam Lesinski [Tue, 6 Oct 2015 00:51:13 +0000 (00:51 +0000)]
am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev

* commit '46684d2caeef93f43be260d996e925ea6e4147ea':
  Add anydpi to the providing-resources docs

8 years agoDo not bring home stack to front when removing non-focused stack
Chong Zhang [Tue, 6 Oct 2015 00:06:28 +0000 (17:06 -0700)]
Do not bring home stack to front when removing non-focused stack

Also, launch task in freeform stack if it's resizeable.

bug: 24671570
Change-Id: Icc4f342b954e5f80dde3609fb65412686f4f0f95

8 years agoUse app compat theme for DocsActivity.
Steve McKay [Tue, 6 Oct 2015 00:41:23 +0000 (17:41 -0700)]
Use app compat theme for DocsActivity.

This make things super UGLAY, but unbreaks them.

Bug:24544391
Change-Id: Id91e7b41cab08f1158f4821fa75be9b3ad79a428

8 years agoam ec090107: am 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper...
Jean-Michel Trivi [Tue, 6 Oct 2015 00:31:44 +0000 (00:31 +0000)]
am ec090107: am 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper thread

* commit 'ec09010730f556a0a746d7b175feca49571eec19':
  Fix AudioService rotation helper thread

8 years agoam 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper thread
Jean-Michel Trivi [Tue, 6 Oct 2015 00:27:18 +0000 (00:27 +0000)]
am 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper thread

* commit '7f33f6e92fa22f47af2f8d61883197013fae4c66':
  Fix AudioService rotation helper thread

8 years agoam 38b987ab: am 0155856a: Fix AudioService rotation helper thread
Jean-Michel Trivi [Tue, 6 Oct 2015 00:20:09 +0000 (00:20 +0000)]
am 38b987ab: am 0155856a: Fix AudioService rotation helper thread

* commit '38b987ab794f7e249a239db26dcf98ca8d2ff72b':
  Fix AudioService rotation helper thread

8 years agoAdded SDK version code for N.
Wale Ogunwale [Mon, 5 Oct 2015 23:52:53 +0000 (16:52 -0700)]
Added SDK version code for N.

Change-Id: Id0ca002650842299f076a3f181b3455cd8a0f06b

8 years agoam 0155856a: Fix AudioService rotation helper thread
Jean-Michel Trivi [Tue, 6 Oct 2015 00:14:01 +0000 (00:14 +0000)]
am 0155856a: Fix AudioService rotation helper thread

* commit '0155856a1d1cb272d83b6175953dd7151fe65daa':
  Fix AudioService rotation helper thread

8 years agoMerge "Improve algorithm for deciding which dim layers to animate."
Filip Gruszczynski [Mon, 5 Oct 2015 23:58:46 +0000 (23:58 +0000)]
Merge "Improve algorithm for deciding which dim layers to animate."

8 years agoImprove algorithm for deciding which dim layers to animate.
Filip Gruszczynski [Mon, 5 Oct 2015 19:40:28 +0000 (12:40 -0700)]
Improve algorithm for deciding which dim layers to animate.

We always want to animate non full screen dim layers, even if there
are full screen dimlayers registered. If there are full screen dim
layers we prefer the one that is currently dimming, otherwise any of
the full screen dim layers (since they are shared).

Bug: 24668543
Change-Id: Icfd5cca83fc371c641ceb2e7a7b62178535984b7

8 years agoam 6314f0bf: am 456a4516: am a186456f: Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:55:04 +0000 (23:55 +0000)]
am 6314f0bf: am 456a4516: am a186456f: Safely handle interrupts during Thread.join()

* commit '6314f0bf9b32f5f26b79410b11677184d7d4063c':
  Safely handle interrupts during Thread.join()

8 years agoam 456a4516: am a186456f: Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:47:42 +0000 (23:47 +0000)]
am 456a4516: am a186456f: Safely handle interrupts during Thread.join()

* commit '456a451668728a18198927fe93f19896929535d3':
  Safely handle interrupts during Thread.join()

8 years agoam 6ac1aa3d: am c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread...
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:46:10 +0000 (23:46 +0000)]
am 6ac1aa3d: am c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread.join()"

* commit '6ac1aa3d4a649ae2ed57d3bb4116a15b4e5b8a50':
  Safely handle interrupts during Thread.join()

8 years agoam a186456f: Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:42:13 +0000 (23:42 +0000)]
am a186456f: Safely handle interrupts during Thread.join()

* commit 'a186456ff58a6091603956b6788565a273a29485':
  Safely handle interrupts during Thread.join()

8 years agoam c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread.join()"
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:39:04 +0000 (23:39 +0000)]
am c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread.join()"

* commit 'c9390c8baf0a41633c176d6d9a2d7e5d0c61c387':
  Safely handle interrupts during Thread.join()

8 years agoam 46b51097: Merge "Safely handle interrupts during Thread.join()"
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:33:38 +0000 (23:33 +0000)]
am 46b51097: Merge "Safely handle interrupts during Thread.join()"

* commit '46b51097b92900866ac5b25762f622d3ceb1be5d':
  Safely handle interrupts during Thread.join()

8 years agoSafely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()

Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit 83461d73bc50d41f631e1db5c195d12b4eb9e6cf)

8 years agoMerge "Safely handle interrupts during Thread.join()"
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:27:10 +0000 (23:27 +0000)]
Merge "Safely handle interrupts during Thread.join()"

8 years agoam 034d10bf: am e5d3baf2: LayoutLib: Fix bitmap scaling.
Deepanshu Gupta [Mon, 5 Oct 2015 23:26:07 +0000 (23:26 +0000)]
am 034d10bf: am e5d3baf2: LayoutLib: Fix bitmap scaling.

* commit '034d10bf6c6d817d316597620c74dd1e8bd2931d':
  LayoutLib: Fix bitmap scaling.

8 years agoam e5d3baf2: LayoutLib: Fix bitmap scaling.
Deepanshu Gupta [Mon, 5 Oct 2015 23:22:18 +0000 (23:22 +0000)]
am e5d3baf2: LayoutLib: Fix bitmap scaling.

* commit 'e5d3baf22f046d0a579128fc258f6b92e700ca02':
  LayoutLib: Fix bitmap scaling.

8 years agoMerge "Support for specifying stack to launch an activity from recents in."
Wale Ogunwale [Mon, 5 Oct 2015 23:09:44 +0000 (23:09 +0000)]
Merge "Support for specifying stack to launch an activity from recents in."

8 years agoLayoutLib: Fix bitmap scaling.
Deepanshu Gupta [Mon, 5 Oct 2015 21:37:54 +0000 (14:37 -0700)]
LayoutLib: Fix bitmap scaling.

Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be

8 years agoMerge "Removing multiwindow debug flag."
Winson Chung [Mon, 5 Oct 2015 22:51:41 +0000 (22:51 +0000)]
Merge "Removing multiwindow debug flag."

8 years agoSafely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()

Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2

8 years agoRemoving multiwindow debug flag.
Winson [Mon, 5 Oct 2015 22:44:23 +0000 (15:44 -0700)]
Removing multiwindow debug flag.

- Also removing unused code for dismissing recents.

Change-Id: I6dcfbdb43cd08f4adfa362d4bf2247c0172fb92a

8 years agoMerge "Add anydpi to the providing-resources docs" into mnc-dev
Adam Lesinski [Mon, 5 Oct 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Add anydpi to the providing-resources docs" into mnc-dev

8 years agoMerge "Enable activity rendering during window animations"
Chet Haase [Mon, 5 Oct 2015 22:27:02 +0000 (22:27 +0000)]
Merge "Enable activity rendering during window animations"

8 years agoFix AudioService rotation helper thread
Jean-Michel Trivi [Mon, 5 Oct 2015 22:26:21 +0000 (15:26 -0700)]
Fix AudioService rotation helper thread

Fix a race condition where the wait index can be incremented inbetween
  the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
  the last sleep is useless.

Bug 24677424

Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24

8 years agoMerge "First cut of user restriction layering."
Makoto Onuki [Mon, 5 Oct 2015 22:21:57 +0000 (22:21 +0000)]
Merge "First cut of user restriction layering."

8 years agoFirst cut of user restriction layering.
Makoto Onuki [Thu, 1 Oct 2015 20:19:58 +0000 (13:19 -0700)]
First cut of user restriction layering.

- Start persisting restrictions set by DO/PO.

- Also dump user restrictions on dumpsys

- More changes will follow, including migration.

- Now System settings are mockable.

Bug 23902097
Bug 23902477

Change-Id: I0bda22f484e1a8e259a1feb2df83c5f4a29116da

8 years agoSupport for specifying stack to launch an activity from recents in.
Wale Ogunwale [Mon, 5 Oct 2015 21:37:03 +0000 (14:37 -0700)]
Support for specifying stack to launch an activity from recents in.

Bug: 24668831
Change-Id: Iebd019d3a566a6d068253d8f566c1df88e9e64dd

8 years agoMerge "Don't explicitly foreground tasks."
Steve McKay [Mon, 5 Oct 2015 22:07:28 +0000 (22:07 +0000)]
Merge "Don't explicitly foreground tasks."

8 years agoMerge "DocumentsUI: Enable focus on directory contents."
Ben Kwa [Mon, 5 Oct 2015 22:00:30 +0000 (22:00 +0000)]
Merge "DocumentsUI: Enable focus on directory contents."

8 years agoEnable activity rendering during window animations
Chet Haase [Thu, 1 Oct 2015 20:25:58 +0000 (13:25 -0700)]
Enable activity rendering during window animations

A change was made back in ICS that prevents the view hierarchy from rendering
during window animations. Specifically, it allows the hierarchy to render once (to draw
the results of its first layout), but further drawing is suppressed at the
ViewRoot/performTraversals level until the window animation is complete.

This change was introduced to avoid jank problems that were resulting from
thrashing the GPU by issuing drawing commands from multiple processes simultaneously,
and limited the number of rendering processes to mainly the system server (and
possibly the System UI), which allowed window animations to be much smoother.

This fix contributed to another source of jank, however, in which applications
which attempt to animate when they first appear will not render any frames of
animations until the window animation is done, resulting is a snapping to the resulting
state once the window animations are complete.

Meanwhile, hardware has gotten faster and GPUs have gotten better, and it is time to
revisit this logic. This change disables the earlier fix and allows view hierarchies
to draw normally, regardless of whether window animations are taking place.

Issue #22232939 Remove flag that prevents drawing during window animations

Change-Id: I4c960180771ff09a7088abd77b437586e835a991

8 years agoDon't explicitly foreground tasks.
Steve McKay [Mon, 5 Oct 2015 19:32:46 +0000 (12:32 -0700)]
Don't explicitly foreground tasks.

Get out of the way of documentLaunchMode, let ActivityManager do the work for us.
Quiet some noisy logging.

Bug: 24413182
Change-Id: Ia48244871296f5c6b83a838dcde6496acbd45793

8 years agoDocumentsUI: Enable focus on directory contents.
Ben Kwa [Fri, 2 Oct 2015 19:59:13 +0000 (12:59 -0700)]
DocumentsUI: Enable focus on directory contents.

- Enable the focus bit on grid and list items.
- Add (ugly placeholder) styles so we can see the focused item.

BUG=24677520

Change-Id: I29fc09cd24c67d50f93937030606dbfc64962932

8 years agoMerge "Add instant lettering encoding and length limit carrier config options."
Tyler Gunn [Mon, 5 Oct 2015 21:32:33 +0000 (21:32 +0000)]
Merge "Add instant lettering encoding and length limit carrier config options."

8 years agoMerge "Remove confusing behavior of Rect::intersect() and rename"
Chris Craik [Mon, 5 Oct 2015 21:29:41 +0000 (21:29 +0000)]
Merge "Remove confusing behavior of Rect::intersect() and rename"

8 years agoRemove confusing behavior of Rect::intersect() and rename
Chris Craik [Mon, 5 Oct 2015 19:23:46 +0000 (12:23 -0700)]
Remove confusing behavior of Rect::intersect() and rename

bug:24670525

Removes silly 'do nothing if rects do not intersect' behavior, and
changes the name to clarify the difference (contrasting against
SkRect::intersect())

bug:24670525

Change-Id: Id2ca1cfea1a9d720d4dc70b251f426d9916f8b53

8 years agoMerge "Moved alert setup code to onCreate"
Fyodor Kupolov [Mon, 5 Oct 2015 20:53:11 +0000 (20:53 +0000)]
Merge "Moved alert setup code to onCreate"

8 years agoMerge "FastJNI canvas"
John Reck [Mon, 5 Oct 2015 20:14:29 +0000 (20:14 +0000)]
Merge "FastJNI canvas"

8 years agoMerge "Fix dock divider going under application windows."
Filip Gruszczynski [Mon, 5 Oct 2015 19:48:05 +0000 (19:48 +0000)]
Merge "Fix dock divider going under application windows."

8 years agoAdd anydpi to the providing-resources docs
Adam Lesinski [Tue, 8 Sep 2015 21:16:49 +0000 (14:16 -0700)]
Add anydpi to the providing-resources docs

Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f

8 years agoMerge "Initial changes to drag and drop to docked task."
Winson Chung [Mon, 5 Oct 2015 19:28:59 +0000 (19:28 +0000)]
Merge "Initial changes to drag and drop to docked task."

8 years agoFastJNI canvas
John Reck [Mon, 5 Oct 2015 18:15:36 +0000 (11:15 -0700)]
FastJNI canvas

Change-Id: Iae33a4785e52efe6f8bbe5bee258f4df830feceb

8 years agoam dd62fb43: am f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved...
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:40:08 +0000 (18:40 +0000)]
am dd62fb43: am f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev

* commit 'dd62fb4392664c3c7dc43c7556351b36cf17dcf2':
  Fix the logging of wake time saved by Ungaze.

8 years agoam f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into...
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:34:57 +0000 (18:34 +0000)]
am f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev

* commit 'f107709fb3f884f904deb1f3c09a88dd411ea30d':
  Fix the logging of wake time saved by Ungaze.

8 years agoam 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:29:24 +0000 (18:29 +0000)]
am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev

* commit '13a71fbcf056d34421a7740a75e2c8dc11d30eb6':
  Fix the logging of wake time saved by Ungaze.

8 years agoMerge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:23:12 +0000 (18:23 +0000)]
Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev

8 years agoFix the logging of wake time saved by Ungaze.
Nick Armstrong-Crews [Wed, 30 Sep 2015 23:49:19 +0000 (16:49 -0700)]
Fix the logging of wake time saved by Ungaze.

The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.

Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e

8 years agoInitial changes to drag and drop to docked task.
Winson [Fri, 2 Oct 2015 00:24:51 +0000 (17:24 -0700)]
Initial changes to drag and drop to docked task.

Change-Id: I5e7a435a4061d902e5de0a54cc386388bc2b565e

8 years agoMerge "Fix recents crashing during docked stack resize."
Filip Gruszczynski [Mon, 5 Oct 2015 17:59:12 +0000 (17:59 +0000)]
Merge "Fix recents crashing during docked stack resize."

8 years agoFix recents crashing during docked stack resize.
Filip Gruszczynski [Sun, 4 Oct 2015 23:43:48 +0000 (16:43 -0700)]
Fix recents crashing during docked stack resize.

Whether acitvity window should be preserved during the relaunch is
controlled by the activity manager and the existence of
non-client-decor should not affect it. For example, docked activities
will not have non-client-decor, but we would like to preserve them
anyway.

Bug: 24573657
Change-Id: I5d4852c3b7c26ac3ec1bbc105639f75b67d1d3ad

8 years agoMerge "Refactoring of WMS.addAppWindowToListLocked."
Filip Gruszczynski [Mon, 5 Oct 2015 17:55:37 +0000 (17:55 +0000)]
Merge "Refactoring of WMS.addAppWindowToListLocked."

8 years agoRefactoring of WMS.addAppWindowToListLocked.
Filip Gruszczynski [Mon, 5 Oct 2015 04:25:48 +0000 (21:25 -0700)]
Refactoring of WMS.addAppWindowToListLocked.

1) getTokenWindowsOnDisplay can be private;
2) in addAppWindowToListLocked the first operation should be checking
display content;
3) adding window to exiting window token extracted to a separate
method;
4) fetching window list directly from the display content, instead of
going through the window.
Change-Id: Ibe196fb6eea15b7800938bdaefcbe8cd1a76ca14

8 years agoMerge "Remove device initializer agent"
Craig Lafayette [Mon, 5 Oct 2015 17:52:05 +0000 (17:52 +0000)]
Merge "Remove device initializer agent"

8 years agoMerge "Do not check consistency on eng build."
Xiaohui Chen [Mon, 5 Oct 2015 17:38:15 +0000 (17:38 +0000)]
Merge "Do not check consistency on eng build."

8 years agoFix dock divider going under application windows.
Filip Gruszczynski [Mon, 5 Oct 2015 16:15:21 +0000 (09:15 -0700)]
Fix dock divider going under application windows.

When windows are added they might be added on the top of the list of
windows that share the same base layer. Dock divider does share the
base layer with application windows, but should be always above them.

Bug: 24635258
Change-Id: I3b5b7e64b625b225100058b73a671a92b908173d

8 years agoMerge "Fix "pm list permissions GROUP""
Makoto Onuki [Mon, 5 Oct 2015 16:03:00 +0000 (16:03 +0000)]
Merge "Fix "pm list permissions GROUP""

8 years agoMerge "Adjust docked stack divider for orientation."
Filip Gruszczynski [Mon, 5 Oct 2015 15:59:38 +0000 (15:59 +0000)]
Merge "Adjust docked stack divider for orientation."

8 years agoAdjust docked stack divider for orientation.
Filip Gruszczynski [Sat, 3 Oct 2015 23:00:24 +0000 (16:00 -0700)]
Adjust docked stack divider for orientation.

Bug: 24575031
Change-Id: Iabebaab386a5e4df3e9af36be329bc0384fd6c87

8 years agoMerge "Animate radial time picker selector during hour/minute transition"
Alan Viverette [Mon, 5 Oct 2015 14:51:29 +0000 (14:51 +0000)]
Merge "Animate radial time picker selector during hour/minute transition"

8 years agoam 5c6fff54: (-s ours) am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82...
Geoff Mendal [Mon, 5 Oct 2015 14:26:49 +0000 (14:26 +0000)]
am 5c6fff54: (-s ours) am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE

* commit '5c6fff5431aa83a4082f6203ac8cdd4122f3f9fb':
  Import translations. DO NOT MERGE

8 years agoam ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translati...
Geoff Mendal [Mon, 5 Oct 2015 14:16:19 +0000 (14:16 +0000)]
am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE

* commit 'ad111b653251e0af212da964d56112cda7d628d9':
  Import translations. DO NOT MERGE

8 years agoam 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 14:09:18 +0000 (14:09 +0000)]
am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE

* commit '3daab8e7a7e68ceb8f15cfcb0d8becf4e86a6c05':
  Import translations. DO NOT MERGE

8 years agoam faebbe82: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 14:05:00 +0000 (14:05 +0000)]
am faebbe82: (-s ours) Import translations. DO NOT MERGE

* commit 'faebbe82fa72036db75d679d366681822d2d551c':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 13:58:33 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import

8 years agoMerge "Include what you use"
Tom Hudson [Mon, 5 Oct 2015 13:03:07 +0000 (13:03 +0000)]
Merge "Include what you use"