Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,987 Commits 3 Branches 0 Tags
cd965c6dcf32eebbc2d79ff3f347032b2118b5ac
Commit Graph

39804 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Jaewan Kim
edaece1f30 Merge "TIF: Accept any character for custom label." into lmp-dev 2014-08-21 16:13:25 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label. 
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
 2014-08-22 01:05:40 +09:00
Kenny Guy
7a13ea7e3b Merge "Replicate text and sounds settings for managed profile." into lmp-dev 2014-08-21 15:55:43 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Esteban Talavera
e17fce679a am 82e2dd54: am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit '82e2dd5457724811141d54d124505d3130eba29b':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:23:27 +00:00
Esteban Talavera
5cef4fa9c1 Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 2014-08-21 15:21:59 +00:00
Jorim Jaggi
922fb7a7db Merge "Update notification layouts to match redlines" into lmp-dev 2014-08-21 15:21:22 +00:00
Kenny Guy
6460657d0e Replicate text and sounds settings for managed profile. 
Replicate touch sound / vibrate setting and show password
setting between managed and parent user.

Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733
 2014-08-21 16:19:35 +01:00
Esteban Talavera
d449f101d1 am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '87d536ab13bda0ebd1a8f7d28f8b11c895debff4':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:15:10 +00:00
Jorim Jaggi
445d3c0a6f Update notification layouts to match redlines 
Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
 2014-08-21 17:13:55 +02:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
John Reck
e4d7d34761 am 872c7679: am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit '872c7679bc5461d2fdb26ffeb091b88bc912b77b':
  Run RevealAnimator on RT
 2014-08-21 14:34:18 +00:00
Esteban Talavera
8cce064f1b am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '50a84946336e747378ea8f09ff1bf3d6fb457ebe':
  Remove setApplicationsHidden
 2014-08-21 14:34:13 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
John Reck
94f6878bbd Merge "Run RevealAnimator on RT" into lmp-dev 2014-08-21 14:23:29 +00:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Esteban Talavera
1aee98fbf3 Updated documentation for setScreenCaptureDisabled() 
As requested in the API review. Also, removed unused import.

Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f
 2014-08-21 14:03:55 +01:00