Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,941 Commits 3 Branches 0 Tags
999cd3d0924ebcd58bb552100a80d86e7c2ff0fb
Commit Graph

233941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
999cd3d092 Merge branch 'nyc-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev-plus-aosp 2016-02-20 00:25:29 +00:00
Chris Craik
565d78f385 Merge "Cleanup cached state in TestUtils::runOnRenderThread" into nyc-dev 
am: 043aeb8224

* commit '043aeb8224ffcbe2d6a8b3f2db4bd6ee0259b66e':
  Cleanup cached state in TestUtils::runOnRenderThread
 2016-02-20 00:23:55 +00:00
Chris Craik
92e5d7553b Merge "Cleanup cached state in TestUtils::runOnRenderThread" into nyc-dev 
am: 043aeb8224

* commit '043aeb8224ffcbe2d6a8b3f2db4bd6ee0259b66e':
  Cleanup cached state in TestUtils::runOnRenderThread
 2016-02-20 00:22:10 +00:00
Vadim Tryshev
935755cc3b Merge "Add Wallpaper.getBitmapAsUser()" into nyc-dev 
am: a6a127747a

* commit 'a6a127747ae04c12966737b3792dc5df4402c292':
  Add Wallpaper.getBitmapAsUser()
 2016-02-20 00:20:30 +00:00
Doris Liu
63e66c54b5 Merge "Ensure invalidate is called after start()/reverse()" into nyc-dev 
am: 06e653aea6

* commit '06e653aea60d982748f2dccc678f5ea37151b604':
  Ensure invalidate is called after start()/reverse()
 2016-02-20 00:19:24 +00:00
Chris Craik
043aeb8224 Merge "Cleanup cached state in TestUtils::runOnRenderThread" into nyc-dev 2016-02-20 00:13:29 +00:00
Vadim Tryshev
a6a127747a Merge "Add Wallpaper.getBitmapAsUser()" into nyc-dev 2016-02-20 00:11:41 +00:00
Doris Liu
06e653aea6 Merge "Ensure invalidate is called after start()/reverse()" into nyc-dev 2016-02-20 00:04:58 +00:00
Arunesh Mishra
ef3b0b4ed5 Merge "Fix minor bugs:" into nyc-dev 
am: 28af5fcdc9

* commit '28af5fcdc9047909eb31babc8ea18d2c39e4c93b':
  Fix minor bugs:
 2016-02-20 00:01:49 +00:00
Arunesh Mishra
28af5fcdc9 Merge "Fix minor bugs:" into nyc-dev 2016-02-19 23:57:59 +00:00
Chris Craik
1bc4ee4506 Cleanup cached state in TestUtils::runOnRenderThread 
Change-Id: I097217c80db5c509d97ef050633946110fccbc80
 2016-02-19 15:57:45 -08:00
Jeff Sharkey
a7e3f45294 Merge "Relax protected broadcast check to allow shell." into nyc-dev 
am: 0e16984d06

* commit '0e16984d0630f1b01704578568e562283f80b799':
  Relax protected broadcast check to allow shell.
 2016-02-19 23:56:17 +00:00
Jeff Sharkey
0e16984d06 Merge "Relax protected broadcast check to allow shell." into nyc-dev 2016-02-19 23:52:20 +00:00
Wale Ogunwale
fedbf9c31f Merge "Clean-up WindowState if exit animation is done before app finishes" into nyc-dev 
am: 9ecf7cfee8

* commit '9ecf7cfee8c681587bd7cf6468aff80178e2d2d9':
  Clean-up WindowState if exit animation is done before app finishes
 2016-02-19 23:50:34 +00:00
Jeff Sharkey
935dafbf0d Relax protected broadcast check to allow shell. 
The shell is often used for developer testing, so we shouldn't
require all of its broadcasts to be protected.

Bug: 27273532
Change-Id: Ic6f262dd11223dee5655614aad30365d51e180c5
 2016-02-19 16:49:26 -07:00
Shreyas Basarge
31236ac232 Merge "NPE Fix in SyncStorageEngine" into nyc-dev 
am: 7503d06e5e

* commit '7503d06e5e31850fd13f85212543e7bd321853fc':
  NPE Fix in SyncStorageEngine
 2016-02-19 23:46:02 +00:00
Aurimas Liutikas
abf9e5695d Merge "Fix a set of random warnings in frameworks/base/" into nyc-dev 
am: 359df40aaf

* commit '359df40aaf4be97e94e78465fa06a6b6a018466b':
  Fix a set of random warnings in frameworks/base/
 2016-02-19 23:37:01 +00:00
Wale Ogunwale
9ecf7cfee8 Merge "Clean-up WindowState if exit animation is done before app finishes" into nyc-dev 2016-02-19 23:35:41 +00:00
Shreyas Basarge
7503d06e5e Merge "NPE Fix in SyncStorageEngine" into nyc-dev 2016-02-19 23:31:24 +00:00
Selim Cinek
4e0b58be83 Merge "Fixed a clicking bug on the lockscreen" into nyc-dev 
am: e961f32b0f

* commit 'e961f32b0f96902276c69f25a35e89aa8cc34ea0':
  Fixed a clicking bug on the lockscreen
 2016-02-19 23:20:46 +00:00
Aurimas Liutikas
359df40aaf Merge "Fix a set of random warnings in frameworks/base/" into nyc-dev 2016-02-19 23:20:06 +00:00
Selim Cinek
147ad1680b Merge "Add support for custom media notifications" into nyc-dev 
am: c68190ae90

* commit 'c68190ae903685a8243e82f94c03c325ba00e121':
  Add support for custom media notifications
 2016-02-19 23:19:35 +00:00
Wale Ogunwale
c48a354733 Clean-up WindowState if exit animation is done before app finishes 
In ag/862571 we prevent window states from been removed before the
app is stopped since it can still be rendering to the surface.
The CL also left WindowState.mExiting as true after the exit
transition animation runs. This is okay if the app finishes before
the exit animation is done, but if the exit animation finishes before
the app finishes, then we will always think we need to run an exit
animation and not remove the windows when the app and later activity
manager tries to remove the windows.
mExiting is used to mean exiting animation is running, if it is set to
true then all the code assumes an exit animation is still running and
doesn't remove the window state.
- Always set mExiting when animation is done.
- Renamed mExiting to mAnimatingExit so it is more clear what it is used
for
- Allow window state to be removed is the current surface isn't shown.
This should be save since there won't be any visual effect to the user.
- Rename WindowState.mClientRemoveRequested to WindowState.mWindowRemovalAllowed
and move setting it to true into WMS.removeWindow() so it catches all cases.
- Cleaned-up the code some to be a little clearer.

Bug: 27112965
Change-Id: I6f03d3c75b5b7728e42ceadc8703df40a3b4ae63
 2016-02-19 15:18:45 -08:00
Selim Cinek
9867f9ae34 Merge "Cleaned up the logic for the picture end margin" into nyc-dev 
am: 54c857cda6

* commit '54c857cda62fbd3a86f5a74924fcea23b89bb1f5':
  Cleaned up the logic for the picture end margin
 2016-02-19 23:17:45 +00:00
Selim Cinek
bf920eac45 Merge "Media notifications now properly respect font size changes" into nyc-dev 
am: 24ffe236b1

* commit '24ffe236b1ca89b6088a5488c591ea836ee59e1c':
  Media notifications now properly respect font size changes
 2016-02-19 23:15:27 +00:00
Selim Cinek
10a16df62d Merge "Adapted the measuring of notification content view" into nyc-dev 
am: 79fa406933

* commit '79fa406933c5ec65e2d48279dc9e0011809512b3':
  Adapted the measuring of notification content view
 2016-02-19 23:11:28 +00:00
Selim Cinek
3145572f64 Merge "Added the possibility to show custom notifications decorated." into nyc-dev 
am: 3c306d8acd

* commit '3c306d8acdb34b667ad55ad30a9a2119cad0e0ab':
  Added the possibility to show custom notifications decorated.
 2016-02-19 23:09:22 +00:00
Jorim Jaggi
c8749149d8 Fix configuration calculation when task is non-fullscreen 
am: 82c9dc951e

* commit '82c9dc951e8e19b9eab6120b6465e08c5d69beba':
  Fix configuration calculation when task is non-fullscreen
 2016-02-19 23:07:46 +00:00
Arunesh Mishra
933da8150c Fix minor bugs: 
- Fix issue when multiple starts cause multiple spurious loads to be sent to
   the native layer.
 - Fix scrolling issue in the native app.

Bug: 27222043
Change-Id: Iddf36a8b68637f478dc23b001ecbde352db3a5f0
 2016-02-19 15:06:27 -08:00
Selim Cinek
e961f32b0f Merge "Fixed a clicking bug on the lockscreen" into nyc-dev 2016-02-19 23:04:55 +00:00
Selim Cinek
c68190ae90 Merge "Add support for custom media notifications" into nyc-dev 2016-02-19 23:04:42 +00:00
Selim Cinek
54c857cda6 Merge "Cleaned up the logic for the picture end margin" into nyc-dev 2016-02-19 23:04:26 +00:00
Selim Cinek
24ffe236b1 Merge "Media notifications now properly respect font size changes" into nyc-dev 2016-02-19 23:04:15 +00:00
Selim Cinek
79fa406933 Merge "Adapted the measuring of notification content view" into nyc-dev 2016-02-19 23:03:59 +00:00
Selim Cinek
3c306d8acd Merge "Added the possibility to show custom notifications decorated." into nyc-dev 2016-02-19 23:03:38 +00:00
Jorim Jaggi
82c9dc951e Fix configuration calculation when task is non-fullscreen 
Apparently only the navigation bar is excluded when calculating
Configuration.screenLayout. Make the calculation for non-fullscreen
tasks consistent with fullscreen tasks.

Change-Id: I027e41e49ffe95245116f3d134e0bc93af0ee450
 2016-02-19 22:59:34 +00:00
Doris Liu
edbb35074d Merge "End staging animators when destroy RootRenderNode" into nyc-dev 
am: 46151a4739

* commit '46151a4739b0ab9620010b16551e60471c959244':
  End staging animators when destroy RootRenderNode
 2016-02-19 22:55:57 +00:00
Doris Liu
d1dd6ade33 Merge "Revert "Revert "Check RenderNode\'s owning view before attaching animators""" into nyc-dev 
am: e87a74e1a3

* commit 'e87a74e1a3511b2bc5a5c15936a9a52bd8724ea3':
  Revert "Revert "Check RenderNode's owning view before attaching animators""
 2016-02-19 22:53:00 +00:00
Doris Liu
1a6d0bbed5 Merge "VectorDrawable native rendering - Step 5 of MANY" into nyc-dev 
am: 0a1cdee33e

* commit '0a1cdee33e279463e40c43c0fac31e581b25ad4b':
  VectorDrawable native rendering - Step 5 of MANY
 2016-02-19 22:51:20 +00:00
Yorke Lee
dcd93cc21a Add Wallpaper.getBitmapAsUser() 
Add a new API to allow a wallpaper bitmap to be obtained for
a specific user.

Without this API, using only getWallpaperFile(..., userId), one
can't get a default wallpaper bitmap if the wallpaper is not set.

Bug: 25185253
Change-Id: Ibe1e9a49d22bee08fd4bed415573c1ee28526aea
 2016-02-19 14:47:39 -08:00
Doris Liu
46151a4739 Merge "End staging animators when destroy RootRenderNode" into nyc-dev 2016-02-19 22:45:55 +00:00
Doris Liu
e87a74e1a3 Merge "Revert "Revert "Check RenderNode's owning view before attaching animators""" into nyc-dev 2016-02-19 22:45:16 +00:00
Doris Liu
0a1cdee33e Merge "VectorDrawable native rendering - Step 5 of MANY" into nyc-dev 2016-02-19 22:44:52 +00:00
Jorim Jaggi
659653ab50 Merge "Fix clip reveal animation in docked window case" into nyc-dev 
am: 36548847f2

* commit '36548847f27d4f912104ff2e547bd3b6ec23a01c':
  Fix clip reveal animation in docked window case
 2016-02-19 22:36:00 +00:00
Doris Liu
c21e8bcb01 Ensure invalidate is called after start()/reverse() 
Change-Id: Iec96ada74cc7b845e21b5f0eb208ff7c7b1071ed
 2016-02-19 14:35:55 -08:00
Jorim Jaggi
36548847f2 Merge "Fix clip reveal animation in docked window case" into nyc-dev 2016-02-19 22:27:32 +00:00
Mady Mellor
8205e5bd5e Merge "Improve touch target for the gear beneath a notification" into nyc-dev 
am: ed8f6cff50

* commit 'ed8f6cff50e495329f33535e5302c70e3439e838':
  Improve touch target for the gear beneath a notification
 2016-02-19 22:24:53 +00:00
Doris Liu
350e65206c End staging animators when destroy RootRenderNode 
When animation happens in a dialog, it is possible for the dialog to
be dismissed and RootRenderNode to be destroyed before we create
animation handle for the staged animators. In that case, we need
to remove the staged animators so they will not run without a
animation handle.

Bug: 26975079
Change-Id: I0c2c6c1b530beaec3984c0b1c410df4fd8f25c95
 2016-02-19 14:20:37 -08:00
Jorim Jaggi
7e17f73b69 Merge "New behavior for docked stack when going home" into nyc-dev 
am: 0bea7ebf56

* commit '0bea7ebf56d00513411378d6b287878ccaa028e1':
  New behavior for docked stack when going home
 2016-02-19 22:19:02 +00:00
Mady Mellor
ed8f6cff50 Merge "Improve touch target for the gear beneath a notification" into nyc-dev 2016-02-19 22:15:55 +00:00