Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,138 Commits 3 Branches 0 Tags
8fcefbbe4f3ad4aabb9091ac367cd4afb99a4dad
Commit Graph

41607 Commits

Author SHA1 Message Date
Yin-Chia Yeh
8fcefbbe4f am af9b726b: am 3661aa85: am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev 
* commit 'af9b726b4c557d8aaa42170a36c73e6ffd7fd8c6':
  Camera2: add toString for TonemapCurve
 2014-09-13 02:27:00 +00:00
George Mount
ce8a17cbc9 am aaa80ced: am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev 
* commit 'aaa80ceda45b1936ca140ca20be0f2e8e1f07318':
  Reset the alpha for offscreen views.
 2014-09-13 02:26:54 +00:00
Adam Powell
b82025bba1 am 2c1ed37f: am 7362db5d: am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev 
* commit '2c1ed37fb28fc1b45c211af3c8830c88212bb265':
  Make Toolbars eat touch events
 2014-09-13 02:26:49 +00:00
George Mount
1340b81a9d am a5a9061f: am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit 'a5a9061f7e3679387285671ff94caa5dde65f2b0':
  Changed method name to match Activity's method name.
 2014-09-13 02:26:43 +00:00
Alan Viverette
d4aefb9289 am c1bfcd42: am 99c628c4: am 4e7d44a5: Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev 
* commit 'c1bfcd42f55cdda31acd684aac607f73c6766451':
  Fix toolbar height, list divider alpha, action item padding
 2014-09-13 02:24:29 +00:00
Jessica Hummel
fb97a8ed51 am 8c6d0c62: am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 
* commit '8c6d0c622c4c48676a14e97dc0e4f1431a763e29':
  Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
 2014-09-13 02:17:01 +00:00
Marcin Kosiba
4debd8ed58 am 85fece5c: am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '85fece5c6d284afb58a7550a55d24606a20b4905':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-13 02:16:17 +00:00
Sander Alewijnse
923f567c85 am ae675cb2: am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'ae675cb2a18ec63ae69bd1b69ea7b5a2f486cce0':
  Rename email extra.
 2014-09-13 02:15:59 +00:00
Alexandra Gherghina
c0f0a96ce4 am b566b869: am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit 'b566b869a88485f33f4ae1a281d3c5c0487c95d0':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-13 02:15:54 +00:00
George Mount
7c736df48f am b2d22b3d: am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 
* commit 'b2d22b3dd381243a292b2f1b405ef52f35dbf4b3':
  Fixed NPE in EnterTransitionCoordinator
 2014-09-13 02:15:42 +00:00
Chris Wren
d79e4cd8c8 am 700269d6: am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 
* commit '700269d6a98920e3b7df9202b901f63852c75530':
  remove unused matchesCallFilter(Bundle, int)
 2014-09-13 02:15:34 +00:00
Christoph Studer
72b4556267 am add991ff: am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev 
* commit 'add991ff3a5fd9b5ccc562441ecf437f5e2f2f1f':
  Notification: Reset chronometer visibility
 2014-09-13 02:15:26 +00:00
Kenny Guy
456a14ac4e am 09e1ce52: am 46247469: am b5153aba: Hide APIs renamed during API review of LauncherApps 
* commit '09e1ce5249141b0b97e34e16f9f43b15f8b552f5':
  Hide APIs renamed during API review of LauncherApps
 2014-09-13 02:15:14 +00:00
Jessica Hummel
ea7c1dc4a9 am 1a1b9446: am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev 
* commit '1a1b94468b14a4627614cb7fb9a057076c2369bd':
  Use correct string for provisioning complete action.
 2014-09-13 02:14:54 +00:00
Jinsuk Kim
63261163ac am a34e6334: am 527346ab: am ead8ed86: CEC: Bug fixes for vendor-specific command handling 
* commit 'a34e6334cd2deb1b66c08766a8de4817523f18cb':
  CEC: Bug fixes for vendor-specific command handling
 2014-09-13 02:14:39 +00:00
Yin-Chia Yeh
c01898c073 am 3661aa85: am e3505a3d: Merge "Camera2: add toString for TonemapCurve" into lmp-dev 
* commit '3661aa8594e17d4d1401a86993d19e436f3ae525':
  Camera2: add toString for TonemapCurve
 2014-09-12 23:21:28 +00:00
George Mount
bc3e75a5c1 am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev 
* commit '1390a1a2c6eca730b7606cc700aa1b42fc71b6ab':
  Reset the alpha for offscreen views.
 2014-09-12 23:21:23 +00:00
Adam Powell
214860b030 am 7362db5d: am 91089aa5: Merge "Make Toolbars eat touch events" into lmp-dev 
* commit '7362db5d1c24ccc9e0c641d8d3f5ff0eefb1bc37':
  Make Toolbars eat touch events
 2014-09-12 23:21:18 +00:00
George Mount
cb9ebc088a am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev 
* commit '47dece7797c4fc6e19b42b605a5b9d45023a0bc9':
  Changed method name to match Activity's method name.
 2014-09-12 23:21:01 +00:00
Yin-Chia Yeh
8eec09a1fc Merge "Camera2: add toString for TonemapCurve" into lmp-dev 2014-09-12 21:55:12 +00:00
George Mount
54f4ba8d7a Merge "Reset the alpha for offscreen views." into lmp-dev 2014-09-12 21:52:28 +00:00
Adam Powell
f116056a80 Merge "Make Toolbars eat touch events" into lmp-dev 2014-09-12 21:49:25 +00:00
George Mount
26f68a01b4 Merge "Changed method name to match Activity's method name." into lmp-dev 2014-09-12 21:28:45 +00:00
George Mount
85ea498d86 Changed method name to match Activity's method name. 
Bug 17488968

Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
 2014-09-12 14:19:40 -07:00
Yin-Chia Yeh
b086421b41 Camera2: add toString for TonemapCurve 
Bug: 16899576
Change-Id: Id7c08afed8606efc880cc75201287cd70a0e301c
 2014-09-12 14:12:13 -07:00
Adam Powell
61d15b9856 Make Toolbars eat touch events 
Just like action bars, toolbars shouldn't allow touches to fall
through to sibling views that they overlap.

Bug 17483356

Change-Id: I9068e1f9cf3c4226000e0058c371283a997b1bd0
 2014-09-12 14:11:28 -07:00
George Mount
653ea66a9f Reset the alpha for offscreen views. 
Bug 17469303

When stripping the offscreen views from a transition, the alpha
wasn't reset, so they were made permanently invisible.

Change-Id: I2e87fff1d3b1e417997cabf9c703143355fe2c01
 2014-09-12 13:58:12 -07:00
Alan Viverette
7d6fc23fe7 am 99c628c4: am 4e7d44a5: Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev 
* commit '99c628c49642ac29511f7ae642ebfd031091a026':
  Fix toolbar height, list divider alpha, action item padding
 2014-09-12 20:27:11 +00:00
Alan Viverette
c1cbe8cfb9 Merge "Fix toolbar height, list divider alpha, action item padding" into lmp-dev 2014-09-12 20:01:09 +00:00
Alan Viverette
9d9581f52e Fix toolbar height, list divider alpha, action item padding 
BUG: 17487305
BUG: 17470290
BUG: 17486967
Change-Id: Ib0cb4308f9d57e730504bdeb125662b648cad0f7
 2014-09-12 12:54:02 -07:00
Yohei Yukawa
db2d31a2d2 am 869642df: am 5bdb322f: am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev 
* commit '869642df55345676fbdd263708bd1380d3eba483':
  API Review: Clean up removed APIs
 2014-09-12 19:28:25 +00:00
Jinsuk Kim
5ae2f08971 am db7eb5b3: am 6d4c60e8: am b3ac0ef8: Merge "Replace the MHL register name \'scratchpad\' with \'vendor\'" into lmp-dev 
* commit 'db7eb5b3c87c56128b421f5928242246f3261b39':
  Replace the MHL register name 'scratchpad' with 'vendor'
 2014-09-12 19:26:08 +00:00
Craig Mautner
efd34c4834 am bebb3088: am a7027783: am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev 
* commit 'bebb3088ab9d4ee7bcacdb2904c47ae3470a7090':
  Show all windows from activity that hides keyguard
  Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
 2014-09-12 19:26:02 +00:00
Alan Viverette
21360c7339 am 5c2c69bb: am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit '5c2c69bb552f2d7eaa357969ab0da8877441cc5a':
  Remove unsafe methods that take TypedArray
 2014-09-12 19:25:52 +00:00
Michael Wright
93f120b6ee am f015309d: am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit 'f015309d6df6647732d35e01133d278cd2b59e69':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 19:24:52 +00:00
George Mount
66618a18de am d40001d5: am 4ac75dce: am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 
* commit 'd40001d585e818609ad9169da0a557a9dde1e16f':
  Fixed empty TransitionSet not notifying listeners.
 2014-09-12 19:24:46 +00:00
Amith Yamasani
20320aac7b am b7db8990: am 807bce1c: am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 
* commit 'b7db89906f6f7e7bae1213a1a17dac0b536bf45b':
  Annotate bindServiceAsUser with SystemApi
 2014-09-12 19:24:42 +00:00
Alan Viverette
55e948e41f am 30225f51: am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit '30225f51f0c00043c96f6f74e10a5181c1c4b10b':
  Vertically align toolbar child views with similar gravities
 2014-09-12 19:24:27 +00:00
Adam Powell
6e9f8a7be1 am 9854feaf: am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit '9854feaf50aeae95adfa1a70e037a95d4cd3b85d':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 19:24:10 +00:00
Craig Mautner
72c781d7d0 am 2df97e5f: am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2df97e5f112ac74e34cf7ec243c1e37b4b1fd921':
  If activity is an alias get maxRecents from target
 2014-09-12 19:24:05 +00:00
Jeff Davidson
4dd5383175 am 1cb2e760: am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit '1cb2e7603e13c23594b5a03b56f2fafd09d94c38':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 19:24:00 +00:00
Prerepa Viswanadham
8e91c94ca0 am a4a6bca6: am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit 'a4a6bca675df63115b52e7a16aebbdd6beb59657':
  Remove onConnectionCongested callback
 2014-09-12 19:23:47 +00:00
George Mount
e799cd44e0 am d28671db: am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 
* commit 'd28671db218886b24ca3fe38ad8446fdef04b5dc':
  Fixed: TransitionSet setStartDelay did nothing.
 2014-09-12 19:23:31 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
Igor Murashkin
67335343f4 am 0682190b: am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 
* commit '0682190b025b5039567532de2a752a00e7c20977':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
 2014-09-12 19:23:15 +00:00
Sreeram Ramachandran
dd6ecbaaee am 2b3b6875: am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '2b3b68753f4bb2231d9a17393fdfeac93a1b24c0':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 19:23:08 +00:00
Chet Haase
3e2ff75f7b am 4280132f: am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev 
* commit '4280132f44a20d42cffd436d8eab7653c82b3249':
  Make starting window hw-accelerated
 2014-09-12 19:22:14 +00:00
Jessica Hummel
f5f5ed7bc3 am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 
* commit '61896e3ba7c75bd062f6fa3a3ba2c2bfd7a8826f':
  Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
 2014-09-12 19:19:46 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-12 19:19:24 +00:00
Marcin Kosiba
26dd49f4c1 am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '6e6ae86a8659a02e30bdf1a9ec4ca910c4a78215':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 19:19:04 +00:00