OSDN Git Service
Jorim Jaggi [Fri, 6 Nov 2015 21:00:18 +0000 (22:00 +0100)]
Update divider shadow when it is moving
Change-Id: Ifc67ba3ee640929248cad6479d9c0df818e32f40
Jorim Jaggi [Fri, 6 Nov 2015 20:31:17 +0000 (21:31 +0100)]
Fix build
Change-Id: Ie716bbec49920af459ceddf8e51387ccf5946a7f
Jorim Jaggi [Fri, 6 Nov 2015 19:54:50 +0000 (20:54 +0100)]
Don't kill process when dismissing stack
Also clear the binder identity to incorrect permission
checks, which lead to crashes when dismissing the docked
stack.
Change-Id: I53175769745e8bbdbc296806b9297eb3c53d4452
Filip Gruszczynski [Fri, 6 Nov 2015 19:49:01 +0000 (19:49 +0000)]
Merge "Fix windows disappearing when resizing freeform or docked."
Filip Gruszczynski [Fri, 6 Nov 2015 17:21:17 +0000 (09:21 -0800)]
Fix windows disappearing when resizing freeform or docked.
Also includes some code clarity improvements: mHasSurface is set using a
setter, some fields get private.
Change-Id: I2f834880493c008fdccf07ff6ebfebd2e26690a9
Alan Viverette [Fri, 6 Nov 2015 19:41:59 +0000 (19:41 +0000)]
Merge "Correctly handle child drawables with no intrinsic size"
Jorim Jaggi [Fri, 6 Nov 2015 19:28:42 +0000 (19:28 +0000)]
Merge changes I619be025,I126765a3,I0307c191,I9425785f,I623bd48d, ...
* changes:
Restore changes lost during merge
Fix flicker at the end of docked stack divider animation
Implement divider UX interactions
Immediately start resizing when touching docked divider
Fix black holes and flickering in docked resizing
Migrate docked divider drawing to SysUI
Supply app transition specs with a future
Jorim Jaggi [Fri, 6 Nov 2015 16:32:44 +0000 (17:32 +0100)]
Restore changes lost during merge
Change-Id: I619be025988470e27b614ed0ad009e5d785f19eb
Alan Viverette [Fri, 6 Nov 2015 19:09:31 +0000 (19:09 +0000)]
Merge "Use ConstantState directly instead of ConstantStateFuture"
Chris Elliott [Fri, 6 Nov 2015 18:54:10 +0000 (18:54 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am:
d9a2be8d3d -s ours am:
634221adb2 am:
54919264d8
am:
8d19637651 -s ours
* commit '
8d19637651d03fee04ad2b0e56d5a5502ab0c23e':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 18:46:32 +0000 (18:46 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am:
d9a2be8d3d -s ours am:
634221adb2
am:
54919264d8
* commit '
54919264d8ab758a29c6d417d7bcd5a949c0b6e9':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 18:41:35 +0000 (18:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am:
d9a2be8d3d -s ours
am:
634221adb2
* commit '
634221adb28f765233889cca32078e4b042198f3':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Chris Elliott [Fri, 6 Nov 2015 18:36:16 +0000 (18:36 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
am:
d9a2be8d3d -s ours
* commit '
d9a2be8d3d5bd0e170fec71c316373e268a8c17f':
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
Makoto Onuki [Fri, 6 Nov 2015 18:32:35 +0000 (18:32 +0000)]
Merge "Add DPM.getUserRestrictions()"
Makoto Onuki [Fri, 30 Oct 2015 18:07:51 +0000 (11:07 -0700)]
Add DPM.getUserRestrictions()
This returns per-DO/PO restrictions.
Bug
23902097
Change-Id: I225c1b01444fe2f60e5a6674d327182cc9bb15dc
Makoto Onuki [Fri, 6 Nov 2015 18:29:12 +0000 (18:29 +0000)]
Merge "Have AudioService listen to DISALLOW_UNMUTE_MICROPHONE and"
Makoto Onuki [Fri, 6 Nov 2015 18:28:55 +0000 (18:28 +0000)]
Merge "Do not allow DO and PO running on the same user."
Chris Elliott [Fri, 6 Nov 2015 17:41:17 +0000 (17:41 +0000)]
DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE
This reverts commit
7e19e286cc990daaafe934ed82ddfa00762907d6.
Change-Id: I808047efe13cdbf560d15e1ba081417e866ef83a
Todd Kennedy [Fri, 6 Nov 2015 17:31:02 +0000 (17:31 +0000)]
Merge "Move 'un/install' to cmd"
Todd Kennedy [Wed, 4 Nov 2015 01:08:55 +0000 (17:08 -0800)]
Move 'un/install' to cmd
Move the implementation of the install variants and uninstall to the cmd
command. Additionally, make two other important changes: 1) replace calls
to the legacy PackageManager#installPackageAsUser with the PackageInstaller
2) allow streaming package bits for 'pm install'
Change-Id: Ia49dac0ccd6470f9d1c1964bdeb3c0b22b856075
Svet Ganov [Fri, 6 Nov 2015 17:02:00 +0000 (09:02 -0800)]
Fix some docs
Change-Id: Ie28788330249a1f96b7b168a05546d3d0862a9cf
Matt Sarett [Fri, 6 Nov 2015 16:25:40 +0000 (11:25 -0500)]
Rename SkBitmapRegionDecoder to BitmapRegionDecoder
This is temporary, we are planning to delete this class.
Renaming will allow us to have an SkBitmapRegionDecoder class
in Skia.
Change-Id: I8d24d481d4e8cf782f578fa6deb6e3245c998a37
Jorim Jaggi [Thu, 5 Nov 2015 12:59:32 +0000 (13:59 +0100)]
Fix flicker at the end of docked stack divider animation
Because w.isDragResize() was still true but we already
cleared the flag of the divider controller that it was
resizing, there was a frame at the end of the resize
operation at which all stack surfaces were placed at 0/0,
leading to a flicker.
Fix flicker at the end of docked stack divider animation
Because w.isDragResize() was still true but we already
cleared the flag of the divider controller that it was
resizing, there was a frame at the end of the resize
operation at which all stack surfaces were placed at 0/0,
leading to a flicker.
Change-Id: I126765a31703e5405687bcc511960a41024eb652
Jorim Jaggi [Wed, 4 Nov 2015 15:39:50 +0000 (16:39 +0100)]
Implement divider UX interactions
- Update visuals to spec
- Divider lifts when touching
- Implement basic version of snap points and animations
- Implement touch conflict behavior: If touched around 48x48dp
area around the handle, the divider handles all these touches.
If touched outside of the black background divider, touch goes
directly to underlying window. If touch on the black background
divider, touch is considered slippery and thus the window in
which the touch trace moves gets the touches.
Change-Id: I0307c191ae032672c4b73d439c23cf9833d3fce6
Jorim Jaggi [Tue, 3 Nov 2015 14:15:40 +0000 (15:15 +0100)]
Immediately start resizing when touching docked divider
Before, the surface was made full-screen only after
a certain amount of time. Now, immediately make the surface
full-screen, as soon as the divider is touched, to make
resizing much snappier.
Bug:
24507122
Change-Id: I9425785fca4e62964a959a432c80a81d346602c5
Jorim Jaggi [Tue, 3 Nov 2015 11:38:42 +0000 (12:38 +0100)]
Fix black holes and flickering in docked resizing
When we start a resize with the docked stack divider,
set the surface background to be full-screen, and use
the traditional surface clipping/positioning in window
manager to adjust the size. This ensures that we don't
have any black holes because of asynchronicity (except
at the very beginning, but this can be worked around
later), and the position of the right/bottom activity
is always in sync with the position of the divider.
Also fix a bug in NonClientDecorView where the first
request to draw was dropped (because the thread hasn't
started up yet), and the main thread was waiting for it
indefinitily.
Bug:
24507122
Change-Id: I623bd48d5be64fac2fba45241b84f265944d200d
Jorim Jaggi [Thu, 29 Oct 2015 15:54:18 +0000 (16:54 +0100)]
Migrate docked divider drawing to SysUI
Move docked divider drawing to SysUI. This let's us have real
time shadows in the future. Keep DockedStackDividerController
for placing/visibility in window manager.
Change-Id: I82c10add626d30f2ba180ee2a21cdbe6ddfe0371
Jorim Jaggi [Thu, 29 Oct 2015 12:08:29 +0000 (13:08 +0100)]
Supply app transition specs with a future
Because we retain activity surfaces now, the app transition specs
which were calculated/generated after the onPause() call when going
from recents -> app were too slow. Instead, supply a cross-process
future, which gets fetched when the window manager is about to be
ready to execute the app transition. In practice, this still gets
executed immediately after the onPause call.
If we have a retained surface, this adds some latency, but since we
absolutely need the specs to execute the transition, we have that
latency no matter where exactly we generate the specs.
If we don't have a retained surface, the specs are not calculated on
the critical path, so it's faster.
Bug:
19940527
Change-Id: I80d2c6f6b3a6568a70339619ecefbc3bd8409bd8
Bart Sears [Fri, 6 Nov 2015 09:08:46 +0000 (09:08 +0000)]
Merge "Revert "Clarify geometry management for SurfaceView""
Bart Sears [Fri, 6 Nov 2015 09:07:58 +0000 (09:07 +0000)]
Revert "Clarify geometry management for SurfaceView"
This reverts commit
78a45f2bd8794d7a85e7443820862d466edf2324.
Change-Id: I782f688f52a85df84d9facef2fbf88c28f4a7082
Rob Carr [Fri, 6 Nov 2015 02:09:35 +0000 (02:09 +0000)]
Merge "Clarify geometry management for SurfaceView"
Vladislav Kaznacheev [Fri, 6 Nov 2015 01:31:54 +0000 (01:31 +0000)]
Merge "Expose the desktop location of an unconsumed drag and drop"
Svetoslav Ganov [Fri, 6 Nov 2015 00:52:35 +0000 (00:52 +0000)]
Merge "Take into account default app for default grants" am:
7abb36599d am:
57fb4bd4f7
am:
66ce9698dc
* commit '
66ce9698dc06662b4f3d5aece80f33d52efca53f':
Take into account default app for default grants
Filip Gruszczynski [Fri, 6 Nov 2015 00:51:04 +0000 (00:51 +0000)]
Merge "Fix wallpaper flicker when docking a window from freeform."
Svetoslav Ganov [Fri, 6 Nov 2015 00:46:35 +0000 (00:46 +0000)]
Merge "Take into account default app for default grants" am:
7abb36599d
am:
57fb4bd4f7
* commit '
57fb4bd4f704c93ff73e055e6602ee18f7dbf669':
Take into account default app for default grants
Svetoslav Ganov [Fri, 6 Nov 2015 00:43:44 +0000 (00:43 +0000)]
Merge "Revert "Take into account default app for default grants"" am:
9ae3aeec53 am:
0c4ce4474f
am:
88cdc715c0
* commit '
88cdc715c0795969be7f68d7363a0edfecebeea2':
Revert "Take into account default app for default grants"
Svetoslav Ganov [Fri, 6 Nov 2015 00:40:48 +0000 (00:40 +0000)]
Merge "Take into account default app for default grants"
am:
7abb36599d
* commit '
7abb36599d9537296d9a51f766152025c6ed0491':
Take into account default app for default grants
Svetoslav Ganov [Fri, 6 Nov 2015 00:36:44 +0000 (00:36 +0000)]
Merge "Revert "Take into account default app for default grants"" am:
9ae3aeec53
am:
0c4ce4474f
* commit '
0c4ce4474ff0020b2b041f26fb00efbdc0783285':
Revert "Take into account default app for default grants"
Svetoslav Ganov [Fri, 6 Nov 2015 00:34:21 +0000 (00:34 +0000)]
Merge "Take into account default app for default grants"
Svetoslav [Fri, 6 Nov 2015 00:33:02 +0000 (16:33 -0800)]
Take into account default app for default grants
Change-Id: Ib78c7dbda65d405bbf74544cad18e5e10bfcdeec
Filip Gruszczynski [Fri, 6 Nov 2015 00:32:35 +0000 (00:32 +0000)]
Merge "Fix minor problems when resizing/maximizing docked window."
Svetoslav Ganov [Fri, 6 Nov 2015 00:31:13 +0000 (00:31 +0000)]
Merge "Revert "Take into account default app for default grants""
am:
9ae3aeec53
* commit '
9ae3aeec532ce5a7908d395049efb61399875360':
Revert "Take into account default app for default grants"
Chong Zhang [Fri, 6 Nov 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Destroy dimLayer surface in removeDimLayerUser() if it is not fullscreen."
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:59 +0000 (00:24 +0000)]
Merge "Revert "Take into account default app for default grants""
Svetoslav Ganov [Fri, 6 Nov 2015 00:24:47 +0000 (00:24 +0000)]
Revert "Take into account default app for default grants"
Apparently OEMs can set the chooser so this patch is not enough since it assumes the chooser is a platform component.
This reverts commit
fce33d58d87fd494686aae4e21332b58ec260b73.
Change-Id: I3b8e499d2f0a731a227d193f6c5d6ed528be2272
Filip Gruszczynski [Thu, 5 Nov 2015 23:38:59 +0000 (15:38 -0800)]
Fix minor problems when resizing/maximizing docked window.
When maximizing the transition should originate from visible bounds, so
the first frame matches what is visible to the user. When switching to
the big surface, we only need to increase the layer by one, instead of
having artificially large value. If we use the large value, it will
cause a flicker over system windows.
Also includes some cleanup, like static imports and necessary logging.
Bug:
24913915
Change-Id: I84d7594622aa639e2008c662f941edf9c20b3202
Tenghui Zhu [Fri, 6 Nov 2015 00:10:41 +0000 (00:10 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" am:
3226c57321 am:
cca2857ebb
am:
a1d1d184ac
* commit '
a1d1d184ac4d44e44d051de881106e07aee0464d':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Fri, 6 Nov 2015 00:06:02 +0000 (00:06 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" am:
3226c57321
am:
cca2857ebb
* commit '
cca2857ebb52d3ba06bbd42de7db2c33e04cf0cc':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Fri, 6 Nov 2015 00:00:33 +0000 (00:00 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow"
am:
3226c57321
* commit '
3226c57321f15384ef7c1e93589c6d2a58cbe86c':
When the incoming light source is invalid, don't generate any shadow
Tenghui Zhu [Thu, 5 Nov 2015 23:56:56 +0000 (23:56 +0000)]
Merge "When the incoming light source is invalid, don't generate any shadow"
Chong Zhang [Thu, 5 Nov 2015 23:50:39 +0000 (23:50 +0000)]
Merge "Exclude system decor area from tap detection."
Chris Craik [Thu, 5 Nov 2015 23:48:54 +0000 (23:48 +0000)]
Merge "Add z-reordering support to OpReorderer"
Teng-Hui Zhu [Thu, 5 Nov 2015 00:57:53 +0000 (16:57 -0800)]
When the incoming light source is invalid, don't generate any shadow
b/
25417885
Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
Chris Craik [Thu, 5 Nov 2015 19:08:52 +0000 (11:08 -0800)]
Add z-reordering support to OpReorderer
Change-Id: I3fa969fe53cf648d145810f69fa7dada376c0b9a
Sanket Agarwal [Thu, 5 Nov 2015 23:45:47 +0000 (15:45 -0800)]
Fix signature for a function in java (int (I) -> long (L) ).
Change-Id: Icd632ca9ba79be7f4dc322b35c25ca9f853258a3
Robert Carr [Tue, 3 Nov 2015 19:58:11 +0000 (11:58 -0800)]
Clarify geometry management for SurfaceView
In the hardware accelerated case, RenderThread needs
to be the authority of information on the geometry of
the SurfaceView (this will occur via moving the
repositionWindow call to RenderThread). In order
to support this we have to enable calling relayoutWindow
without geometry (so that it will not fight with
repositionWindow). Add such a mode to relayoutWindow
and use it from SurfaceView. Add size to repositionChild
while we are here.
Change-Id: I12f85f586a38bf86367f3d964cb49f19003d441f
Chris Craik [Thu, 5 Nov 2015 23:32:30 +0000 (23:32 +0000)]
Merge "Add more RenderNode property support in OpReorderer path"
Chong Zhang [Thu, 5 Nov 2015 04:59:26 +0000 (20:59 -0800)]
Destroy dimLayer surface in removeDimLayerUser() if it is not fullscreen.
For a non-fullscreen dimLayerUser, its dimLayer surface is not shared with
other dimLayerUsers and should be destroyed when we remove it from mState.
Change-Id: Iaf300178c2534b87fccca99a836ae3416605c9ca
Chris Craik [Tue, 3 Nov 2015 03:17:45 +0000 (19:17 -0800)]
Add more RenderNode property support in OpReorderer path
Change-Id: I0163fe91d8145e33019739c191bbab0432a5f9aa
Sanket Agarwal [Thu, 8 Oct 2015 21:14:20 +0000 (14:14 -0700)]
Radio features for Automotive usecase.
1. Add clock to metadata - If the CAR does not have a clock (no network
or bad clock) then Radio RDS could be used as a proxy.
2. Add support for emergency announcement - If the CAR wants to make an
emergency announcement.
2.1 Add support for callbacks.
Bug: b/
24807501
Bug: b/
22701655
Change-Id: Ib3131de03a022181559fd31da6701d9d3fa8698d
(cherry picked from commit
659688a129189f2a9aa353ddf9e107d5f293c4ca)
Vladislav Kaznacheev [Thu, 5 Nov 2015 22:03:07 +0000 (14:03 -0800)]
Expose the desktop location of an unconsumed drag and drop
When dispatching DragEvent for ACTION_DRAG_ENDED action
getX and getY will return the location of the drop if it was not
consumed by any app.
Consumed drops will return (0,0) location as before.
Bug:
25486808
Change-Id: Ic57d94b42de62d8327e9ce47d92ba335c21b8ae2
Paul Lawrence [Thu, 5 Nov 2015 22:19:52 +0000 (22:19 +0000)]
Merge "Fix build"
Adam Lesinski [Thu, 5 Nov 2015 00:11:21 +0000 (16:11 -0800)]
Fix non-positional format strings
AAPT doesn't detect non-positional format strings across tags. AAPT2 does.
Change-Id: I9c517f714727e39f195f760816482b6e088cc5f6
Paul Lawrence [Thu, 5 Nov 2015 22:17:03 +0000 (14:17 -0800)]
Fix build
Change-Id: I0ebff8e41c2aa5bec2466d075d9143a5a525e02d
Colin Cross [Thu, 5 Nov 2015 22:10:47 +0000 (14:10 -0800)]
Fix build
std::abs requires <cstdlib>
Change-Id: I0722340d17aed88c4c8dabcb723d432b05cebedb
Makoto Onuki [Fri, 30 Oct 2015 19:58:39 +0000 (12:58 -0700)]
Do not allow DO and PO running on the same user.
Bug
25346603
Change-Id: Ic5fbed82466a538fbf64ef802fc2624dd67313bb
Wale Ogunwale [Thu, 5 Nov 2015 21:57:36 +0000 (21:57 +0000)]
Merge "Set correct focus activity when using FLAG_ACTIVITY_REORDER_TO_FRONT"
Chris Craik [Thu, 5 Nov 2015 21:55:32 +0000 (21:55 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am:
0cf48e9120 am:
17fc83cbde am:
c06ccd77c1
am:
1c3dd0519a -s ours
* commit '
1c3dd0519a90c12589e32aaa6b31fbcc28e87b64':
Revert "Remove -ffast-math from libhwui makefile"
Dan Albert [Thu, 5 Nov 2015 21:42:03 +0000 (21:42 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Paul Lawrence [Thu, 5 Nov 2015 21:41:03 +0000 (21:41 +0000)]
Merge "Add developer option to convert from FDE to FBE"
Rob Carr [Thu, 5 Nov 2015 21:40:09 +0000 (21:40 +0000)]
Merge "Extract application window usage of SurfaceController."
Chong Zhang [Thu, 5 Nov 2015 21:18:33 +0000 (13:18 -0800)]
Exclude system decor area from tap detection.
If we have system decor (status bar/ navigation bar), we want to
exclude that from the tap detection. Otherwise, if the app is partially
placed under some system button (eg. Recents, Home), pressing that
button would cause a full series of unwanted transfer focus/resume/pause,
before we could go home.
Change-Id: Idd408bd69f5064f906bb9f8e2b2385c26a6a6929
Jeff Sharkey [Thu, 5 Nov 2015 21:19:14 +0000 (21:19 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am:
e10faaa410 am:
2de7e39ffa am:
73d60ff36f
am:
8bad938369
* commit '
8bad93836922805a93c2385fa79e22de8288f9ab':
Kick movement preconditions onto handler thread.
Tenghui Zhu [Thu, 5 Nov 2015 21:18:00 +0000 (21:18 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am:
76d20b4a5c am:
1c7fbe0efb am:
d829ab7683
am:
dfaf23f846
* commit '
dfaf23f84669b2f45da892f49b2d8c07f161f7a2':
When the incoming light source is invalid, don't generate any shadow
Joe LaPenna [Thu, 5 Nov 2015 21:16:44 +0000 (21:16 +0000)]
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am:
88c7c3e080 -s ours am:
efcb281bec -s ours
am:
bab8dfd793 -s ours
* commit '
bab8dfd79327309c042b234316813b2c867c9a2c':
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
Baligh Uddin [Thu, 5 Nov 2015 21:15:27 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
69cc50f1e8 -s ours
am:
42facf05ce -s ours
* commit '
42facf05ce7a7b21667335bba2f942ca2eda873d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:14:15 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
97bf3b5922 -s ours
am:
82ab657901 -s ours
* commit '
82ab657901ef66fba38c67d7c6589d22cc82e3dd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:13:05 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5495ee8a9b -s ours
am:
967f81f5d7 -s ours
* commit '
967f81f5d71312e0978ac72420a589a26f86e1ec':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:11:44 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
57b7fa49ac -s ours
am:
335a6c58af -s ours
* commit '
335a6c58afed1ba18e2b2676ef98236d02f19648':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:10:28 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
6be193d87e -s ours
am:
251427a387 -s ours
* commit '
251427a38785144d80374c64fc0e020bf661e95f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:09:39 +0000 (21:09 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Baligh Uddin [Thu, 5 Nov 2015 21:09:12 +0000 (21:09 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
2fd15d5e8c
* commit '
2fd15d5e8c7dbefb49434670cc76a5b94899114c':
Baligh Uddin [Thu, 5 Nov 2015 21:08:07 +0000 (21:08 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
2fd15d5e8c
* commit '
2fd15d5e8c7dbefb49434670cc76a5b94899114c':
Baligh Uddin [Thu, 5 Nov 2015 21:06:51 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
8019f49d08 -s ours
am:
20abfb1089 -s ours
* commit '
20abfb108985de51b380bdfe9501bf304841f622':
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 21:05:28 +0000 (21:05 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am:
c74dd7fcb1
am:
6ae3fe184c -s ours
* commit '
6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5':
Use std::unique_ptr instead of UniquePtr.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
(cherry picked from commit
b0624da1181276ff4caa5e57a7a4abf766902e3e)
Chris Craik [Thu, 5 Nov 2015 20:37:23 +0000 (20:37 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am:
0cf48e9120 am:
17fc83cbde
am:
c06ccd77c1
* commit '
c06ccd77c129cdf198c64babdfd8d289aa8ff908':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:36:00 +0000 (20:36 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am:
e10faaa410 am:
2de7e39ffa
am:
73d60ff36f
* commit '
73d60ff36fbf656d022c2d4f35b8e9f2d25e795f':
Kick movement preconditions onto handler thread.
Chris Craik [Thu, 5 Nov 2015 20:31:39 +0000 (20:31 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev am:
0cf48e9120
am:
17fc83cbde
* commit '
17fc83cbde8ab1e92664d12a0fed306e9054ca55':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:30:12 +0000 (20:30 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am:
e10faaa410
am:
2de7e39ffa
* commit '
2de7e39ffa387b370e5997542811fd05a73cb8fc':
Kick movement preconditions onto handler thread.
Tenghui Zhu [Thu, 5 Nov 2015 20:27:43 +0000 (20:27 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am:
76d20b4a5c am:
1c7fbe0efb
am:
d829ab7683
* commit '
d829ab76831a0c323f669385c54f666f8a91e4f1':
When the incoming light source is invalid, don't generate any shadow
Chris Craik [Thu, 5 Nov 2015 20:25:34 +0000 (20:25 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
am:
0cf48e9120
* commit '
0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
Revert "Remove -ffast-math from libhwui makefile"
Jeff Sharkey [Thu, 5 Nov 2015 20:23:46 +0000 (20:23 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
am:
e10faaa410
* commit '
e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
Kick movement preconditions onto handler thread.
Chris Craik [Thu, 5 Nov 2015 20:21:45 +0000 (20:21 +0000)]
Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev
Tenghui Zhu [Thu, 5 Nov 2015 20:20:29 +0000 (20:20 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev am:
76d20b4a5c
am:
1c7fbe0efb
* commit '
1c7fbe0efbabe5c15ba72e16053551a8fdae1b92':
When the incoming light source is invalid, don't generate any shadow
Jeff Sharkey [Thu, 5 Nov 2015 20:17:13 +0000 (20:17 +0000)]
Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev
Joe LaPenna [Thu, 5 Nov 2015 20:16:12 +0000 (20:16 +0000)]
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE am:
88c7c3e080 -s ours
am:
efcb281bec -s ours
* commit '
efcb281bec4a5ec57815204c89c5666ed35f3bcc':
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
Tenghui Zhu [Thu, 5 Nov 2015 20:13:05 +0000 (20:13 +0000)]
Merge "When the incoming light source is invalid, don\'t generate any shadow" into mnc-dr-dev
am:
76d20b4a5c
* commit '
76d20b4a5c6463235d9497b8018a38c059a6761c':
When the incoming light source is invalid, don't generate any shadow
Joe LaPenna [Thu, 5 Nov 2015 20:09:17 +0000 (20:09 +0000)]
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
am:
88c7c3e080 -s ours
* commit '
88c7c3e08051f4a2be8ee5194214678a07ff7f01':
Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE
Baligh Uddin [Thu, 5 Nov 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
69cc50f1e8 -s ours
* commit '
69cc50f1e881b80db9767ce7535fe58067ca4222':
Import translations. DO NOT MERGE