Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,600 Commits 3 Branches 0 Tags
1014f3373a61fc7e75bb44b877c8f4121ace2ed8
Commit Graph

33999 Commits

Author SHA1 Message Date
John Spurlock
1014f3373a am 25d81a4c: am eebf6895: Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev 
* commit '25d81a4c613a30f55217036dfba92a3c895f8d88':
  Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
 2013-09-04 19:50:02 -07:00
John Spurlock
25d81a4c61 am eebf6895: Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev 
* commit 'eebf6895fde7ef0d87c91d31b3abb36d4a98df66':
  Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."
 2013-09-04 19:46:57 -07:00
John Spurlock
eebf6895fd Merge "Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."" into klp-dev 2013-09-05 02:44:29 +00:00
John Spurlock
322d77185d Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers." 
This reverts commit 5e777f6685.

Change-Id: I6dc00f376cbbe34dafde3470d8e06c9123f81d8d
 2013-09-05 02:39:46 +00:00
Svetoslav Ganov
ae894e78ca am cf2a44e4: am adade10a: Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 
* commit 'cf2a44e413bd38d6c3595c9ca782e07f502b8bce':
  KLP API Review: PrintDocumentAdapter documentation
 2013-09-04 19:31:59 -07:00
Svetoslav Ganov
cf2a44e413 am adade10a: Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 
* commit 'adade10a5186636daaea50e90fddb50c3707d5ed':
  KLP API Review: PrintDocumentAdapter documentation
 2013-09-04 19:30:10 -07:00
Svetoslav Ganov
adade10a51 Merge "KLP API Review: PrintDocumentAdapter documentation" into klp-dev 2013-09-05 02:27:32 +00:00
John Spurlock
f4490f4018 am e82f1ce5: am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 
* commit 'e82f1ce53e51b129eddbc3fea27fe72cb402736b':
  Re-@hide activity-level FLAG_IMMERSIVE and helpers.
 2013-09-04 19:14:42 -07:00
John Spurlock
e82f1ce53e am 631228b0: Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 
* commit '631228b0249de11b5dad37e7a09a251a5558430a':
  Re-@hide activity-level FLAG_IMMERSIVE and helpers.
 2013-09-04 19:11:51 -07:00
John Spurlock
631228b024 Merge "Re-@hide activity-level FLAG_IMMERSIVE and helpers." into klp-dev 2013-09-05 02:09:29 +00:00
Todd Poynor
2e9992583c Merge "BatteryProperty: Add average current property" 2013-09-05 01:37:29 +00:00
Ruben Brunk
8e8393aea4 am 92d7ed1d: am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 
* commit '92d7ed1d5962557a13a24f740ac89afd0afccf37':
  Fix CameraService error flag when running HAL1 with API2.
 2013-09-04 18:32:19 -07:00
Dianne Hackborn
1703c54a0e am 021a138b: am 8144585c: Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 
* commit '021a138bdc0a8d1561cd7a429936afb8983c68b0':
  Fix issue #10422349: Limit/change the battery history data in batterystats
 2013-09-04 18:32:16 -07:00
Wink Saville
125b2f8d09 am 4a18be9e: am e4bcd1b7: am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit '4a18be9edc88caa329c2beb7180fabc26d46f76b':
  Add provisioning apn timeout.
 2013-09-04 18:32:11 -07:00
Ruben Brunk
92d7ed1d59 am f267dd1d: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 
* commit 'f267dd1d794237229fe71f37d54896ce54c9750d':
  Fix CameraService error flag when running HAL1 with API2.
 2013-09-04 18:28:05 -07:00
Dianne Hackborn
021a138bdc am 8144585c: Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 
* commit '8144585c5853d5f2dd5f30e4ab9c0abe7457d556':
  Fix issue #10422349: Limit/change the battery history data in batterystats
 2013-09-04 18:24:36 -07:00
Ruben Brunk
f267dd1d79 Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev 2013-09-05 01:23:40 +00:00
Dianne Hackborn
8144585c58 Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev 2013-09-05 01:21:32 +00:00
Todd Poynor
be7d9e399e BatteryProperty: Add average current property 
Change-Id: I48907708024bddae9770bc1a3f0149ad901075c4
 2013-09-04 18:20:22 -07:00
Wink Saville
4a18be9edc am e4bcd1b7: am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit 'e4bcd1b71408216cc5cdaf8d74001da611828f00':
  Add provisioning apn timeout.
 2013-09-04 18:19:58 -07:00
Wink Saville
e4bcd1b714 am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit '323af8b49df3535977b5aa7f5b31c429d8a50f10':
  Add provisioning apn timeout.
 2013-09-04 18:17:15 -07:00
Wink Saville
323af8b49d am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit 'aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
  Add provisioning apn timeout.
 2013-09-04 18:14:07 -07:00
Wink Saville
aa5b0f8bda am ce1e3798: Add provisioning apn timeout. 
* commit 'ce1e37981caec29df2671a6e2909f00da7f24a00':
  Add provisioning apn timeout.
 2013-09-04 18:11:07 -07:00
Dianne Hackborn
49021f5f79 Fix issue #10422349: Limit/change the battery history data in batterystats 
Don't include history in real checkins; have a new compact option
for bug reports.

Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
 2013-09-04 18:03:40 -07:00
Dianne Hackborn
3facfed942 am a7a8cdfa: am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 
* commit 'a7a8cdfab3af29d4bdec95abd6bde96824129e4e':
  Fix issue #10461600: KLP API Review: UndoManager
 2013-09-04 17:58:58 -07:00
Dianne Hackborn
a7a8cdfab3 am 7f71206d: Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 
* commit '7f71206d009e737e91c4c767183befe6006497c6':
  Fix issue #10461600: KLP API Review: UndoManager
 2013-09-04 17:56:11 -07:00
Dianne Hackborn
7f71206d00 Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev 2013-09-05 00:53:27 +00:00
Dianne Hackborn
b811e64cb3 Fix issue #10461600: KLP API Review: UndoManager 
Hide, hide, hide!

Change-Id: Ie04825723d9392a4258e2d738828201ee387f7c6
 2013-09-04 17:43:56 -07:00
Chet Haase
4918e7ad66 resolved conflicts for merge of 09ed0720 to master 
Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe
 2013-09-04 17:19:44 -07:00
Chet Haase
09ed072028 am 49ee555f: Merge "Transition API changes from API council recommendations" into klp-dev 
* commit '49ee555f239c79871b661e5ff135061f26665e1c':
  Transition API changes from API council recommendations
 2013-09-04 16:49:39 -07:00
Chet Haase
49ee555f23 Merge "Transition API changes from API council recommendations" into klp-dev 2013-09-04 23:47:45 +00:00
Alan Viverette
79a5feff95 Fix the build, use viscous fluid interpolator in OverScroller 
Change-Id: I175a220d1d915161896b9b223acfee08e0face2c
 2013-09-04 16:37:57 -07:00
Chong Zhang
9a465a92f0 am 411af374: am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 
* commit '411af374f9a2fbfb8a88565afdc8fa9ddb7148a9':
  wifi-display: add a global setting to force WPS config method
 2013-09-04 15:14:32 -07:00
Chong Zhang
411af374f9 am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 
* commit 'dbb0b824a7e1dc6909988ec06a46158c05d26a92':
  wifi-display: add a global setting to force WPS config method
 2013-09-04 15:11:33 -07:00
Chong Zhang
dbb0b824a7 Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 2013-09-04 22:07:05 +00:00
Chet Haase
d82c8ac4db Transition API changes from API council recommendations 
Issue #10460684 KLP API Review: android.view.transition and android.animation
Issue #10570740 Transitions: inflate transition targets from xml

Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
 2013-09-04 14:46:38 -07:00
Lajos Molnar
9c5b14977c am a0d70290: am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev 
* commit 'a0d702908cc2da75e0102e1a2f276e2b3feea198':
  Add subtitle support to VideoView.
 2013-09-04 14:38:51 -07:00
Lajos Molnar
a0d702908c am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev 
* commit '171c63db9253e77c2bd11c53eb89b7c3c983669f':
  Add subtitle support to VideoView.
 2013-09-04 14:35:29 -07:00
Fabrice Di Meglio
165d0d5738 am eb4ed48f: am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 
* commit 'eb4ed48f77b8d7889252dcbfcefd97d306347145':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
 2013-09-04 14:35:09 -07:00
Alan Viverette
132fb928dc Merge "Move viscous fluid interpolator to its own class" 2013-09-04 21:33:30 +00:00
Lajos Molnar
171c63db92 Merge "Add subtitle support to VideoView." into klp-dev 2013-09-04 21:32:43 +00:00
Fabrice Di Meglio
eb4ed48f77 am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 
* commit '3ab8e8847d723fd3b114a4c895c5eeb4623412f4':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
 2013-09-04 14:31:37 -07:00
Fabrice Di Meglio
3ab8e8847d Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 2013-09-04 21:26:55 +00:00
Alan Viverette
5c08f7cf86 am 1d26f041: am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 
* commit '1d26f041ab15a9c30fcd8378d5284d9692fba56e':
  Implement drag-to-open in ActivityChooserView
 2013-09-04 14:24:41 -07:00
Romain Guy
2a9807f414 am 1c5a86ab: am cb039124: Merge "Don\'t draw with invalid display lists Bug #10301674" into klp-dev 
* commit '1c5a86ab6028aade1dd34a357192844c1bba5139':
  Don't draw with invalid display lists Bug #10301674
 2013-09-04 14:24:38 -07:00
Alan Viverette
1d26f041ab am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 
* commit '3aa18248013c25b80586d90dba71145d9aae8baf':
  Implement drag-to-open in ActivityChooserView
 2013-09-04 14:21:09 -07:00
Romain Guy
1c5a86ab60 am cb039124: Merge "Don\'t draw with invalid display lists Bug #10301674" into klp-dev 
* commit 'cb039124c145f95bd46fa6c84b585fbad88cf036':
  Don't draw with invalid display lists Bug #10301674
 2013-09-04 14:21:05 -07:00
Chet Haase
56fe281da4 am e4d5c881: am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 
* commit 'e4d5c8815aca38b9772a647e61e980858c778c68':
  Perform layout and invalidation after bringChildToFront()
 2013-09-04 14:21:03 -07:00
Chet Haase
e4d5c8815a am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 
* commit '5f25f7c37390e407b5c3d8545c5d6e0ef03b753a':
  Perform layout and invalidation after bringChildToFront()
 2013-09-04 14:17:25 -07:00
Alan Viverette
3aa1824801 Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 2013-09-04 21:17:00 +00:00