Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
152,299 Commits 3 Branches 0 Tags
04ff14035eb2a0f73558e4b407c0f021e110ba4e
Commit Graph

43618 Commits

Author SHA1 Message Date
George Mount
04ff14035e am fec07efc: am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'fec07efcb3bd69b24c43a6a80bad4edb45671022':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:55:24 +00:00
George Mount
cd965c6dcf am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'ef21ecd5701dec9d7f40036b51bff42528075304':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:45:55 +00:00
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
George Mount
b89d5cc2c6 Allow Activities to opt into using Overlay for shared elements. 
Bug 17001227

Change-Id: Icc49a81357ee69abd2a15a1d1efcead298ab3fb7
 2014-08-21 14:30:51 -07:00
Adam Lesinski
e8e71f3c47 am c93b76d9: am b797a064: am 435afbc5: Merge "Report the right resource version in am get-config" into lmp-dev 
* commit 'c93b76d9e447defd309b7821247e0cb3965bf6ef':
  Report the right resource version in am get-config
 2014-08-21 21:02:08 +00:00
Matthew Williams
9c705edacd am 6eb4900c: am 47d59fb7: am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '6eb4900ce1b79f78efe23c7aa14ba0d7f353d8d5':
  JobScheduler needs to flush queue on charging
 2014-08-21 21:01:57 +00:00
Adam Lesinski
53fc386d5c am b797a064: am 435afbc5: Merge "Report the right resource version in am get-config" into lmp-dev 
* commit 'b797a06449db4019b0c1c6ca8fd4b385770c162c':
  Report the right resource version in am get-config
 2014-08-21 20:49:33 +00:00
Matthew Williams
50892518ed am 47d59fb7: am 7a67b0c9: JobScheduler needs to flush queue on charging 
* commit '47d59fb79d29d590f43be9e26d3cc196cc4aa14f':
  JobScheduler needs to flush queue on charging
 2014-08-21 20:49:27 +00:00
John Reck
5d54b3ccb4 am b236ce24: am 3da1fa50: am 25f606a0: Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 
* commit 'b236ce24d1d4a008346bfeebd863a57e0d628626':
  Fix supporting modifying listeners in callbacks
 2014-08-21 20:48:37 +00:00
John Reck
ee2073d41f am 3da1fa50: am 25f606a0: Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 
* commit '3da1fa506599e1d6fb70937277ce29243f083137':
  Fix supporting modifying listeners in callbacks
 2014-08-21 20:40:54 +00:00
Alan Viverette
2a7c452561 am 7da36b58: am a6fbf40e: am 52e313c1: Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 
* commit '7da36b58f675befdc3ef7fb38fdfcd1b08d40960':
  Jump drawable state (including ripples) on view detach
 2014-08-21 20:39:20 +00:00
Adam Lesinski
b5136731b2 Merge "Report the right resource version in am get-config" into lmp-dev 2014-08-21 20:39:00 +00:00
Matthew Williams
bafeeb9813 JobScheduler needs to flush queue on charging 
Also make it illegal to schedule a job with no constraints.
BUG: 16877705
Change-Id: Iae57286bc4f73163a7e3c9d2d531623fd50f1f72
 2014-08-21 20:37:06 +00:00
Alan Viverette
29c2bca3c5 am a6fbf40e: am 52e313c1: Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 
* commit 'a6fbf40e60135d83abcdeed031d8e3df8e8444ef':
  Jump drawable state (including ripples) on view detach
 2014-08-21 20:32:10 +00:00
John Reck
2b5d920e80 Merge "Fix supporting modifying listeners in callbacks" into lmp-dev 2014-08-21 20:18:56 +00:00
Alan Viverette
04e723c1af Merge "Jump drawable state (including ripples) on view detach" into lmp-dev 2014-08-21 20:03:03 +00:00
Alan Viverette
d78a44576c Jump drawable state (including ripples) on view detach 
BUG: 15350931
Change-Id: I09928f59fb7b9f6d87b1f5219353a41ae6b5681d
 2014-08-21 12:57:45 -07:00
John Reck
3b27e59e1e Fix supporting modifying listeners in callbacks 
Bug: 17179442

Change-Id: I2d64f86395c0b1befb5c10b9c696330db1c96821
 2014-08-21 12:37:48 -07:00
Adam Lesinski
ebc3e4cbf1 Report the right resource version in am get-config 
Change-Id: I79ed3db45d91d8ec7e6f67608533ce3adf22ab27
 2014-08-21 12:21:45 -07:00
Andre Eisenbach
2edc9cbd2c am 2b420554: am bf22072d: am e2f5c5c4: Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 
* commit '2b4205544d4b816fb958681a3aa9b4c8ddfb3e7e':
  LE: Rename new MTU and connection paramter update APIs
 2014-08-21 18:26:19 +00:00
Andre Eisenbach
e50aa22d6f am bf22072d: am e2f5c5c4: Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 
* commit 'bf22072dd6a3bdfabd3be288b2c1b99eea8a9e64':
  LE: Rename new MTU and connection paramter update APIs
 2014-08-21 18:19:12 +00:00
Andre Eisenbach
491cb3f578 Merge "LE: Rename new MTU and connection paramter update APIs" into lmp-dev 2014-08-21 17:56:25 +00:00
Andres Morales
dd9d2498c5 am 97b9be92: am ea5ffd04: am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit '97b9be922d6ce1e1968f52c9122efef58480930e':
  Remove old NFC unlock api
 2014-08-21 17:40:44 +00:00
Andres Morales
d3a520b4cc am ea5ffd04: am 87eeebec: Merge "Remove old NFC unlock api" into lmp-dev 
* commit 'ea5ffd047f340224e4a8df97fc24f2d907b8ee46':
  Remove old NFC unlock api
 2014-08-21 17:27:31 +00:00
Dianne Hackborn
5aef45eca4 am 8c6c54ec: am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit '8c6c54ecfd281751925ff6df566e154c2f8aec60':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:27:02 +00:00
Dianne Hackborn
865bac56f5 am a7d4d7bc: am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'a7d4d7bcfa51aa6d556652141a34c497bb4132d0':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:17:24 +00:00
Chris Craik
5cf96d8b51 am 6b5c0e91: am 6ec6fe3a: am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '6b5c0e919a61ef5e2483b7b2e206919b0f503d73':
  Clarify text shadow attribute/method comments
 2014-08-21 17:15:11 +00:00
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Chris Craik
b1e59e8563 am 6ec6fe3a: am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '6ec6fe3ac2b003208e82848725896866a0945bcf':
  Clarify text shadow attribute/method comments
 2014-08-21 17:04:44 +00:00
Nicolas Prevot
2af85abffd am 2fbb6bb5: am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '2fbb6bb5dd7a359efeeb9b3bc7d0e207021fdced':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:58:10 +00:00
Paul Lawrence
e802cdfdf9 am 14610f68: am d2566bdb: am c8b0ddfc: Merge "Save PatternVisible setting to crypto header" into lmp-dev 
* commit '14610f68ce4e3edcf67b4ee9f861e79ac5b4c808':
  Save PatternVisible setting to crypto header
 2014-08-21 16:58:05 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Zhijun He
cac49eb610 am acb8f467: am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit 'acb8f467c86452b849dc6410db27668525baa075':
  Camera2: update aberration correction related tag name
 2014-08-21 16:48:02 +00:00
Jaewan Kim
c8600f9f12 am fc2dccca: am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit 'fc2dcccab58adf2fb6a750e499cec42180806cb2':
  TIF: Accept any character for custom label.
 2014-08-21 16:47:57 +00:00
Kenny Guy
c616bcc5cc am c18eec1c: am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit 'c18eec1c2848c7fab2693de7138034de316eb0fb':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:47:29 +00:00
Esteban Talavera
8a4f5c7b0e am 065746f2: am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '065746f261d1d650d0ac492ad39abdf982a170ed':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:47:22 +00:00
Esteban Talavera
80f64df7a4 am f88a7165: am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'f88a7165a7ccf18e113cce68504919ac603feb85':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:47:17 +00:00
Nicolas Prevot
b4c43c029e am 6815c529: am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '6815c5298b8b8658cec7eecb43117d7abfe4dd71':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:47:13 +00:00
Jorim Jaggi
6dd325fd79 am bf20472c: am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'bf20472c351b3cb8a1cc32bba35b3fa7f3c65048':
  Update notification layouts to match redlines
 2014-08-21 16:47:13 +00:00
Paul Lawrence
155b06c06e am d2566bdb: am c8b0ddfc: Merge "Save PatternVisible setting to crypto header" into lmp-dev 
* commit 'd2566bdbc91229b8b646ae165b1506fe571a91ec':
  Save PatternVisible setting to crypto header
 2014-08-21 16:47:08 +00:00
Chris Craik
c56a1a51a9 Merge "Clarify text shadow attribute/method comments" into lmp-dev 2014-08-21 16:46:53 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Zhijun He
d38b381086 am 8fece5d0: am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit '8fece5d08a5ee0409a28f383a52ebc7dbfe8afda':
  Camera2: update aberration correction related tag name
 2014-08-21 16:33:43 +00:00
Jaewan Kim
5eaae72f72 am 48f09811: am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit '48f098115b6654ce8da754ff11b40965308f44d5':
  TIF: Accept any character for custom label.
 2014-08-21 16:33:38 +00:00
Paul Lawrence
7bf41929f2 Merge "Save PatternVisible setting to crypto header" into lmp-dev 2014-08-21 16:25:56 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Kenny Guy
80ab66574a am 676fedb0: am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '676fedb03498436cf6551ea9e0ae5486e7fe9e0c':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:20:24 +00:00
Esteban Talavera
29c6dfe446 am 4536f11f: am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit '4536f11f64b6fa2d99f65424819f20401d2c0830':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:20:19 +00:00
Esteban Talavera
de7706999e am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit 'ff3bcbf8134faf2dfddf26bf00afd90c462e9699':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:20:15 +00:00
Jorim Jaggi
7ff086fdff am fa4b90b8: am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'fa4b90b870980baa42ff868d2d331effae70956d':
  Update notification layouts to match redlines
 2014-08-21 16:20:09 +00:00