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

221479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tenghui Zhu
992fb80d8e 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
 2015-11-06 00:10:41 +00:00
Tenghui Zhu
a1d1d184ac 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
 2015-11-06 00:06:02 +00:00
Tenghui Zhu
cca2857ebb 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
 2015-11-06 00:00:33 +00:00
Tenghui Zhu
3226c57321 Merge "When the incoming light source is invalid, don't generate any shadow" 2015-11-05 23:56:56 +00:00
Chong Zhang
d841628aef Merge "Exclude system decor area from tap detection." 2015-11-05 23:50:39 +00:00
Chris Craik
6d9df3974b Merge "Add z-reordering support to OpReorderer" 2015-11-05 23:48:54 +00:00
Teng-Hui Zhu
83ea5b7b22 When the incoming light source is invalid, don't generate any shadow 
b/25417885

Change-Id: I4b87e35ca68091fd0409cb9fe9b9400af860a507
 2015-11-05 15:48:35 -08:00
Chris Craik
161f54b2d4 Add z-reordering support to OpReorderer 
Change-Id: I3fa969fe53cf648d145810f69fa7dada376c0b9a
 2015-11-05 15:45:59 -08:00
Sanket Agarwal
a00acdd1b4 Fix signature for a function in java (int (I) -> long (L) ). 
Change-Id: Icd632ca9ba79be7f4dc322b35c25ca9f853258a3
 2015-11-05 15:45:47 -08:00
Robert Carr
78a45f2bd8 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
 2015-11-05 15:37:42 -08:00
Chris Craik
679f9863f9 Merge "Add more RenderNode property support in OpReorderer path" 2015-11-05 23:32:30 +00:00
Chong Zhang
cb1887ecf9 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
 2015-11-05 15:28:40 -08:00
Chris Craik
76caecf421 Add more RenderNode property support in OpReorderer path 
Change-Id: I0163fe91d8145e33019739c191bbab0432a5f9aa
 2015-11-05 15:25:12 -08:00
Sanket Agarwal
7058e4ca58 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)
 2015-11-05 22:50:59 +00:00
Vladislav Kaznacheev
c748241523 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
 2015-11-05 14:40:27 -08:00
Paul Lawrence
557b64abad Merge "Fix build" 2015-11-05 22:19:52 +00:00
Adam Lesinski
b88b69a792 Fix non-positional format strings 
AAPT doesn't detect non-positional format strings across tags. AAPT2 does.

Change-Id: I9c517f714727e39f195f760816482b6e088cc5f6
 2015-11-05 22:18:11 +00:00
Paul Lawrence
6bcc32504f Fix build 
Change-Id: I0ebff8e41c2aa5bec2466d075d9143a5a525e02d
 2015-11-05 14:17:03 -08:00
Colin Cross
290b23a1e1 Fix build 
std::abs requires <cstdlib>

Change-Id: I0722340d17aed88c4c8dabcb723d432b05cebedb
 2015-11-05 22:15:18 +00:00
Makoto Onuki
803d6757fd Do not allow DO and PO running on the same user. 
Bug 25346603

Change-Id: Ic5fbed82466a538fbf64ef802fc2624dd67313bb
 2015-11-05 14:11:53 -08:00
Wale Ogunwale
3747450956 Merge "Set correct focus activity when using FLAG_ACTIVITY_REORDER_TO_FRONT" 2015-11-05 21:57:36 +00:00
Chris Craik
20b581c70f 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"
 2015-11-05 21:55:32 +00:00
Dan Albert
aace04efb1 Merge "Use std::unique_ptr instead of UniquePtr." 2015-11-05 21:42:03 +00:00
Paul Lawrence
9548b380d9 Merge "Add developer option to convert from FDE to FBE" 2015-11-05 21:41:03 +00:00
Rob Carr
a3761ad76d Merge "Extract application window usage of SurfaceController." 2015-11-05 21:40:09 +00:00
Chong Zhang
73c3fcf576 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
 2015-11-05 13:20:36 -08:00
Jeff Sharkey
3b0660412c 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.
 2015-11-05 21:19:14 +00:00
Tenghui Zhu
7fa281c80f 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
 2015-11-05 21:18:00 +00:00
Joe LaPenna
754ea71379 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
 2015-11-05 21:16:44 +00:00
Baligh Uddin
e307eefc35 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
 2015-11-05 21:15:27 +00:00
Baligh Uddin
951b094367 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
 2015-11-05 21:14:15 +00:00
Baligh Uddin
56d9e6570c 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
 2015-11-05 21:13:05 +00:00
Baligh Uddin
4296f4cbe2 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
 2015-11-05 21:11:44 +00:00
Baligh Uddin
13a4255b9e 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
 2015-11-05 21:10:28 +00:00
Baligh Uddin
2b1b48107a Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-11-05 21:09:39 +00:00
Baligh Uddin
22c84271a9 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':
 2015-11-05 21:09:12 +00:00
Baligh Uddin
5864e720cb 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':
 2015-11-05 21:08:07 +00:00
Baligh Uddin
8366f82d3b 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
 2015-11-05 21:06:51 +00:00
Dan Albert
7a10a986c5 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
 2015-11-05 21:05:28 +00:00
Dan Albert
0881a7445f 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)
 2015-11-05 13:03:26 -08:00
Chad Brubaker
80a73f5939 Use a builder for NetworkSecurityConfig 
The builder supports all the standard builder set* methods as well as
setting a parent builder to use when values are not set (recursively).
This allows us to have a level of inheretence in configurations without
complicating the lookup and trust checking logic by doing inheretence
when building the configs.

Change-Id: I054af83451e52761227479eadf9cb9803437505f
 2015-11-05 12:50:30 -08:00
Chris Craik
1c3dd0519a 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"
 2015-11-05 20:37:23 +00:00
Jeff Sharkey
8bad938369 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.
 2015-11-05 20:36:00 +00:00
Chris Craik
c06ccd77c1 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"
 2015-11-05 20:31:39 +00:00
Jeff Sharkey
73d60ff36f Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev am: e10faaa410 
am: 2de7e39ffa

* commit '2de7e39ffa387b370e5997542811fd05a73cb8fc':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:30:12 +00:00
Tenghui Zhu
dfaf23f846 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
 2015-11-05 20:27:43 +00:00
Chris Craik
17fc83cbde Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev 
am: 0cf48e9120

* commit '0cf48e9120fee8e5f0abc7b50a816bb2bc8e6127':
  Revert "Remove -ffast-math from libhwui makefile"
 2015-11-05 20:25:34 +00:00
Jeff Sharkey
2de7e39ffa Merge "Kick movement preconditions onto handler thread." into mnc-dr-dev 
am: e10faaa410

* commit 'e10faaa41026863b9d0f7dd6b0c239ff79586dc7':
  Kick movement preconditions onto handler thread.
 2015-11-05 20:23:46 +00:00
Chris Craik
0cf48e9120 Merge "Revert "Remove -ffast-math from libhwui makefile"" into mnc-dr-dev 2015-11-05 20:21:45 +00:00
Tenghui Zhu
d829ab7683 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
 2015-11-05 20:20:29 +00:00