Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,119 Commits 3 Branches 0 Tags
52f16f60f17bd56268eca8e2461ba58de25b10fa
Commit Graph

259119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Carr
52f16f60f1 Merge \\"Restore setCropInTransaction HiddenForCrop behavior.\\" into nyc-dev am: 938a70142e 
am: f469be4935

Change-Id: I217dec32a12b6e6ee032e3011d7858cde4e1bb5d
 2016-06-11 01:42:44 +00:00
Robert Carr
f469be4935 Merge \"Restore setCropInTransaction HiddenForCrop behavior.\" into nyc-dev 
am: 938a70142e

Change-Id: Ica7e5c31c1c08f9424b5eb44ab843c3ce2526914
 2016-06-11 01:36:14 +00:00
TreeHugger Robot
938a70142e Merge "Restore setCropInTransaction HiddenForCrop behavior." into nyc-dev 2016-06-11 01:21:22 +00:00
Android Build Merger (Role)
12ef838c98 Merge "Merge \\"Place a black layer behind SurfaceView.\\" into nyc-dev am: 0360a900f7 am: 2eeceeed3a" into nyc-mr1-dev-plus-aosp 2016-06-11 01:05:23 +00:00
Robert Carr
afaede60c0 Merge \\"Place a black layer behind SurfaceView.\\" into nyc-dev am: 0360a900f7 
am: 2eeceeed3a

Change-Id: Ifda6ba98bc66e2fa8719f14cb69356c7eb374cfa
 2016-06-11 01:04:55 +00:00
Robert Carr
cd2af8a35d Merge \\"Place a black layer behind SurfaceView.\\" into nyc-dev am: 0360a900f7 
am: 118b3d23de

Change-Id: I812a4556ad9c9c9120914c6c101fbc697c677ad5
 2016-06-11 01:04:51 +00:00
Robert Carr
118b3d23de Merge \"Place a black layer behind SurfaceView.\" into nyc-dev 
am: 0360a900f7

Change-Id: I734c68b8bb9334f5e02dd34c69ac4bf4da0058b6
 2016-06-11 01:00:52 +00:00
Robert Carr
2eeceeed3a Merge \"Place a black layer behind SurfaceView.\" into nyc-dev 
am: 0360a900f7

Change-Id: Icd77a15f4debe870342976ebbf2edc5544039f38
 2016-06-11 01:00:52 +00:00
TreeHugger Robot
0360a900f7 Merge "Place a black layer behind SurfaceView." into nyc-dev 2016-06-11 00:51:48 +00:00
Kevin Gabayan
3182b29404 Merge \"Compute AnyMotionDetector angle using atan2. Bug: 29232136\" into nyc-mr1-dev 
am: 21f47bcf8c

Change-Id: Ie20b953b39b07cd340f49eb70b3798ae088d6746
 2016-06-11 00:27:41 +00:00
Kevin Gabayan
21f47bcf8c Merge "Compute AnyMotionDetector angle using atan2. Bug: 29232136" into nyc-mr1-dev 2016-06-11 00:20:42 +00:00
Michael Kwan
5c30475094 Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev 
am: 5985e3f92f

Change-Id: I2167505e4c71d6f7bc32d3a90c0c94a0d92319ab
 2016-06-11 00:13:22 +00:00
TreeHugger Robot
5985e3f92f Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev 2016-06-11 00:06:56 +00:00
Tetsutoki Shiozawa
23a8292f1c Merge \\"Solve the infinite loop on clearExternalStorageDataSync\\" into nyc-dev am: d25c718a12 
am: d8bdb89f9a

Change-Id: If85e508f6b73d428747afb8df3f11aa6edd701ff
 2016-06-10 23:28:14 +00:00
Tetsutoki Shiozawa
afab9a4c6d Merge \\"Solve the infinite loop on clearExternalStorageDataSync\\" into nyc-dev am: d25c718a12 
am: 5bdf449a7a

Change-Id: I47c84d329a6398a66e78d8a27f7b43471b9ef9e5
 2016-06-10 23:24:42 +00:00
Tetsutoki Shiozawa
5bdf449a7a Merge \"Solve the infinite loop on clearExternalStorageDataSync\" into nyc-dev 
am: d25c718a12

Change-Id: Ib7f8efc9d74143cedd7ad06aaec7693ca01ae2e7
 2016-06-10 23:20:56 +00:00
Tetsutoki Shiozawa
d8bdb89f9a Merge \"Solve the infinite loop on clearExternalStorageDataSync\" into nyc-dev 
am: d25c718a12

Change-Id: I93d2a6fe287491b957e2851de2ead9d878702e63
 2016-06-10 23:20:50 +00:00
TreeHugger Robot
d25c718a12 Merge "Solve the infinite loop on clearExternalStorageDataSync" into nyc-dev 2016-06-10 23:13:52 +00:00
Kevin Gabayan
b070577d35 Compute AnyMotionDetector angle using atan2. 
Bug: 29232136

Change-Id: Ie57d0228eb42246c4ac1d7a01e2782a621b7e78f
 2016-06-10 16:07:52 -07:00
Robert Carr
086d2929f7 Place a black layer behind SurfaceView. 
For SurfaceView's which do not implement
SurfaceRedrawNeeded we can see holes through to the
background in various scenarios. We prevent this by
placing a DimLayer behind opaque SurfaceViews. SurfaceFlinger
will remove it from the visible layers when the SurfaceView
totally obscures it.

Bug: 28763785
Change-Id: I9b4d1ba8be786f30432a6a3b42e5616662cdc090
 2016-06-10 15:57:08 -07:00
Android Build Merger (Role)
d1640f0320 Merge "Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6 am: 643fc8341a" into nyc-mr1-dev-plus-aosp 2016-06-10 22:48:15 +00:00
Adam Lesinski
b4228085df Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6 
am: 643fc8341a

Change-Id: I094a097c01db63a3af291d3b82b036bef71fd5f6
 2016-06-10 22:47:47 +00:00
Adam Lesinski
e9fdfb6334 Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6 
am: 860e09ddce

Change-Id: I9f8cbdd345bf6b5c95cab4360d89efb9909b3dfd
 2016-06-10 22:47:46 +00:00
Adam Lesinski
643fc8341a Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev 
am: e8a442ccd6

Change-Id: Ic0a5b9acedd9ed56aaa189aaf89aaa10f273f019
 2016-06-10 22:43:49 +00:00
Adam Lesinski
860e09ddce Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev 
am: e8a442ccd6

Change-Id: I08f02adc6014ff9bcae60f60a091bba74695488d
 2016-06-10 22:43:45 +00:00
Robert Carr
4320d33a06 Restore setCropInTransaction HiddenForCrop behavior. 
Prior to c/1106850 setCropInTransaction hid the surface
for crop width and height <= 0. That CL allowed
setting -1 for crop width and height which SF
determines as clearing the crop. Other portions of the code
depend on the old behavior though for negative values, so restore
the behavior of setCropInTransaction and use a new clearCrop
method for the new code.

Bug: 29276588
Change-Id: I728666009c362ff635c7ebfb3ef2e83428fb03fe
 2016-06-10 15:32:04 -07:00
Adam Lesinski
e8a442ccd6 Merge "BatteryStats: Fix read/write parcel order" into nyc-dev 2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849 BatteryStats: Fix read/write parcel order 
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.

Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
 2016-06-10 15:24:16 -07:00
Android Build Merger (Role)
fcfb05f759 Merge "Merge \\"Fixed check for visible volume.\\" into nyc-dev am: be0bacda9b am: 3ff43c5f0c" into nyc-mr1-dev-plus-aosp 2016-06-10 21:59:18 +00:00
Felipe Leme
18ee3e53c8 Merge \\"Fixed check for visible volume.\\" into nyc-dev am: be0bacda9b 
am: 2ee81a3211

Change-Id: I6c568b5934268eb8d7d44bd65a59adba4dabd7a7
 2016-06-10 21:58:51 +00:00
Felipe Leme
71aeae2c5d Merge \\"Fixed check for visible volume.\\" into nyc-dev am: be0bacda9b 
am: 3ff43c5f0c

Change-Id: Ibcbc5fd8cacf53e2bcafc93f1ddbeae3f0475ac4
 2016-06-10 21:58:51 +00:00
Sudheer Shanka
ead9f32ed2 Merge \\"Reduce shell power over user management.\\" into nyc-dev am: 1b4124fc95 
am: a2ef5c89c0

Change-Id: I652af5ae7051cbb83e5361f51f586a2c4940b8ac
 2016-06-10 21:55:11 +00:00
Felipe Leme
3ff43c5f0c Merge \"Fixed check for visible volume.\" into nyc-dev 
am: be0bacda9b

Change-Id: I5b1aa0be01603cfaa09e3dfaa774182f6a62c188
 2016-06-10 21:54:36 +00:00
Felipe Leme
2ee81a3211 Merge \"Fixed check for visible volume.\" into nyc-dev 
am: be0bacda9b

Change-Id: I3802f5025e83826f47d674f6d03e78737d8fe8b3
 2016-06-10 21:54:31 +00:00
TreeHugger Robot
be0bacda9b Merge "Fixed check for visible volume." into nyc-dev 2016-06-10 21:48:11 +00:00
Sudheer Shanka
c1befac360 Merge \\"Reduce shell power over user management.\\" into nyc-dev am: 1b4124fc95 
am: 0979d718c5

Change-Id: I63bb1c87e01b3536096a508046dba9de8b88bb59
 2016-06-10 21:43:38 +00:00
Sudheer Shanka
0979d718c5 Merge \"Reduce shell power over user management.\" into nyc-dev 
am: 1b4124fc95

Change-Id: I5535f68ff670881dfa10bac6b0628d3647be97bd
 2016-06-10 21:39:33 +00:00
Sudheer Shanka
a2ef5c89c0 Merge \"Reduce shell power over user management.\" into nyc-dev 
am: 1b4124fc95

Change-Id: Ia54f3ad9a8594e101407db6b52b378ae8bec72a2
 2016-06-10 21:39:22 +00:00
Android Build Merger (Role)
b39ba10394 Merge "Merge \\"Provide default fallback in theme\\" into nyc-dev am: 7c8360980c am: e5422efdc9" into nyc-mr1-dev-plus-aosp 2016-06-10 21:39:17 +00:00
Jorim Jaggi
9c48b70364 Merge \\"Provide default fallback in theme\\" into nyc-dev am: 7c8360980c 
am: e5422efdc9

Change-Id: Ic28479394db19ee6e49cb6701af6cb566c065988
 2016-06-10 21:38:52 +00:00
Jorim Jaggi
5d296e28d5 Merge \\"Provide default fallback in theme\\" into nyc-dev am: 7c8360980c 
am: 0f31c75051

Change-Id: I6685b30ea33134962f2cb3b67f9e8ff9e6c5e5b4
 2016-06-10 21:38:50 +00:00
TreeHugger Robot
1b4124fc95 Merge "Reduce shell power over user management." into nyc-dev 2016-06-10 21:33:28 +00:00
Tetsutoki Shiozawa
99bf020f70 Solve the infinite loop on clearExternalStorageDataSync 
5000 msec timeout is set for waiting DefaultContainerService, but
it's not working. It's not possible to exit a wait loop even if it
takes over 5000 msec.

Bug: 29232999

Change-Id: I74a45637e0a3fa5a7b151e6b3dc0b3aaece96d53
 2016-06-10 14:31:59 -07:00
Jorim Jaggi
0f31c75051 Merge \"Provide default fallback in theme\" into nyc-dev 
am: 7c8360980c

Change-Id: I030fa1b17f02ae18628d19691016f09473d71a26
 2016-06-10 21:31:25 +00:00
Jorim Jaggi
e5422efdc9 Merge \"Provide default fallback in theme\" into nyc-dev 
am: 7c8360980c

Change-Id: I70328da5ce9ae9988cb58f121caf82c44a16fcec
 2016-06-10 21:31:16 +00:00
TreeHugger Robot
7c8360980c Merge "Provide default fallback in theme" into nyc-dev 2016-06-10 21:20:49 +00:00
Michael Kwan
2fbdb8e855 Merge \"Merge Theme.Micro and Theme.Material.\" into nyc-mr1-dev 
am: 458b716597

Change-Id: I359a10ef14a2dca22fdccbfcbbcbfe4ac55ddc22
 2016-06-10 21:10:08 +00:00
TreeHugger Robot
458b716597 Merge "Merge Theme.Micro and Theme.Material." into nyc-mr1-dev 2016-06-10 21:04:00 +00:00
Android Build Merger (Role)
e6f582c4ee Merge "Merge \\"Recents TV: Add a check for touch enabled mode for starting dismiss animation\\" into nyc-dev am: 7476aaa058 am: 74ea3f08f7" into nyc-mr1-dev-plus-aosp 2016-06-10 20:47:09 +00:00
Sid Soundararajan
a937e02536 Merge \\"Recents TV: Add a check for touch enabled mode for starting dismiss animation\\" into nyc-dev am: 7476aaa058 
am: 74ea3f08f7

Change-Id: Id78ac1729f32ec7c6ab84242f50644c2549d7b1f
 2016-06-10 20:46:48 +00:00