drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,975 Commits 1 Branch 0 Tags
Commit Graph

137975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
90efa8f08c am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev 
* commit '1604d6302a3db07a57827b1c38f7fda21c28d3c6':
  Fix action bar menu inflation context
 2014-06-04 18:45:10 +00:00
Adam Powell
a649e8def9 am 5519852e: Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev 
* commit '5519852e01a646af65efeee30f5b8e80c2cd87e7':
  Implement action bar tab mode for Toolbar-based decor action bars
 2014-06-04 18:45:04 +00:00
Robert Greenwalt
52dea94557 am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev 
* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
  Fix legacy APIs.
 2014-06-04 18:44:59 +00:00
Winson Chung
616ec9d368 am 11aef2b8: Merge "Fixing back regression in Recents." into lmp-preview-dev 
* commit '11aef2b8caddc5aaf573ab52128a8bdb2afe37d1':
  Fixing back regression in Recents.
 2014-06-04 18:44:54 +00:00
Igor Murashkin
da525e542b am 1a68eb96: Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev 
* commit '1a68eb968f77af341a60708b85072ae805e6dc10':
  camera2: Implement most of CameraCaptureSession
 2014-06-04 18:44:46 +00:00
Dianne Hackborn
ed021011dd am b96802d0: Merge "Force write battery stats after a --history-since." into lmp-preview-dev 
* commit 'b96802d03cc5eb047a2be711a8d14d82498753e7':
  Force write battery stats after a --history-since.
 2014-06-04 18:44:37 +00:00
Raph Levien
c5dc037008 am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev 
* commit 'aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
  Better Minikin integration
 2014-06-04 18:44:32 +00:00
Eric Laurent
7d10873c5c am dd76759d: Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev 
* commit 'dd76759d3e279cd56d6b1ce16a0b9488af35e0ab':
  AudioManager: fix AudioPort gain query
 2014-06-04 18:44:26 +00:00
Craig Mautner
f3f8a73a57 am 05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev 
* commit '05cd6c39824653e0f7e8641444a7134e8cac72f4':
  Force all windows to redraw before unblanking screen
 2014-06-04 18:44:16 +00:00
Alan Viverette
3b1e08fc9f am 62ea9554: Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev 
* commit '62ea9554753820df25343e52e0dcab090e5755b5':
  Temporary drawable for Quantum progress indicator
 2014-06-04 18:44:09 +00:00
Adam Powell
3decd141a5 am ab9906c0: Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev 
* commit 'ab9906c0735fb22017f3d673207897347edeba92':
  Support list navigation mode for toolbar action bars
 2014-06-04 18:44:02 +00:00
Ruben Brunk
ccee3b158a am c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev 
* commit 'c354b06955508816af29daefdac5ef9ea9b89fbb':
  DNG: Write out additional fields.
 2014-06-04 18:43:50 +00:00
John Spurlock
7b92af62b8 am 7e127344: Zen: Stateful condition panel. 
* commit '7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
  Zen: Stateful condition panel.
 2014-06-04 18:43:37 +00:00
Alan Viverette
8a3e0a5c0b am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev 
* commit '15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
  Fix build, fix Drawable loop
 2014-06-04 18:43:23 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge 
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
 2014-06-04 11:42:06 -07:00
Alan Viverette
5398aec700 am a929b2d4: Merge "Set starting value on ripple exit animation" into lmp-preview-dev 
* commit 'a929b2d49386cfb3cdf4e0eaecca61184fa0c857':
  Set starting value on ripple exit animation
 2014-06-04 18:09:52 +00:00
Craig Mautner
b3f9156f87 am 43631db9: Merge "Layout keyguard according to flags." into lmp-preview-dev 
* commit '43631db9093a87529a5c1b2732b7102398bbfd2f':
  Layout keyguard according to flags.
 2014-06-04 18:09:26 +00:00
Alan Viverette
62c5c1bd55 am 4d75314b: Merge "Quantum tab indicators, clean up text appearances" into lmp-preview-dev 
* commit '4d75314b5b03cacffddcd15aea7b5172f89b0512':
  Quantum tab indicators, clean up text appearances
 2014-06-04 18:09:21 +00:00
Alan Viverette
1fa8b11d93 am cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev 
* commit 'cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
  Fix drawable cache, add quantum assets to preload list
 2014-06-04 18:09:14 +00:00
Jorim Jaggi
0a9c02df1e am b733f632: Merge "Move owner info to main lockscreen." into lmp-preview-dev 
* commit 'b733f6322870f06d75a020f0f9f0bbba634875e7':
  Move owner info to main lockscreen.
 2014-06-04 18:09:08 +00:00
Jorim Jaggi
34f521e2af am 7a49d92b: Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev 
* commit '7a49d92bf6fd23af7dff29fd3cb97fcd5c05cfc9':
  Fix invalid Keyguard state with encrypted devices.
 2014-06-04 18:09:01 +00:00
Chris Wren
e4a369d1f8 am 02dc5023: Handle Zen Mode computations correctly for updated notifications. 
* commit '02dc50231e5a3d5754281f819df418793260f526':
  Handle Zen Mode computations correctly for updated notifications.
 2014-06-04 18:08:52 +00:00
Chris Wren
30591cc1ab am 1e58ac1d: Merge "Apply Zen Mode later, after we\'ve found the old record." into lmp-preview-dev 
* commit '1e58ac1d71b630435c3e69180d9e92662c6f65dd':
  Apply Zen Mode later, after we've found the old record.
 2014-06-04 18:08:48 +00:00
Jorim Jaggi
d5375b9548 am d98ab64e: Merge "Animate unlock icon while unlocking." into lmp-preview-dev 
* commit 'd98ab64eeb3f12db6a0664dbd3871abe1d18452a':
  Animate unlock icon while unlocking.
 2014-06-04 18:08:43 +00:00
Jorim Jaggi
8f68ed6959 am 4aeb033a: Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev 
* commit '4aeb033aff7259cbffe01931902a9b520ab4648f':
  Fix fake status bar not visible in SHADE_LOCKED state.
 2014-06-04 18:08:28 +00:00
Alan Viverette
d9ec3dafa0 am b1c7f7f5: Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev 
* commit 'b1c7f7f538e8c4947f75406cc6089f6680f59a31':
  Fix NPE when ripples are canceled due to visibility change
 2014-06-04 18:08:22 +00:00
Winson Chung
59255e3c63 am 7b7f89fb: Merge "Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)" into lmp-preview-dev 
* commit '7b7f89fb4b08e81c80821078f92c908f80b21e1e':
  Fixing crash, ensuring that we get the post-animation callback, adding nav bar scrim (Bug. 15157307)
 2014-06-04 18:08:08 +00:00
Tim Murray
1199d87a05 am dddd2625: (-s ours) am af2e7bc2: (-s ours) am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'dddd2625585c80a16f47ef9322a5dee93094c9df':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:59:53 +00:00
Tim Murray
dddd262558 am af2e7bc2: (-s ours) am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'af2e7bc2e0784efd883b495a20aaffa374e8a840':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:56:02 +00:00
Andrew Solovay
478738068f am 750d537a: am c2086e09: am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '750d537acf9f76f8dee18bf256b8ebbac4c460bc':
  docs: Fixed error in code sample.
 2014-06-04 17:54:38 +00:00
Ricardo Cervera
d893701ffb am d53f1bd0: am 234474d5: am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit 'd53f1bd0e4a00677c12d38cfd525b5592d352fd7':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:54:30 +00:00
Andrew Solovay
750d537acf am c2086e09: am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit 'c2086e09df1fa5b0f147f9474a9dd924f487468f':
  docs: Fixed error in code sample.
 2014-06-04 17:43:24 +00:00
Andrew Solovay
c2086e09df am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '15ceb87a07d9ad1fba4265112492e34c5cc360f5':
  docs: Fixed error in code sample.
 2014-06-04 17:40:03 +00:00
Tim Murray
af2e7bc2e0 am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'fdb15a76a30de169aac63d4c2260aa293477557e':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:39:54 +00:00
Andrew Solovay
15ceb87a07 am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs 
* commit '2e10cc9021b1cd3d90c55038191872f29a02c3f2':
  docs: Fixed error in code sample.
 2014-06-04 17:35:45 +00:00
Ricardo Cervera
d53f1bd0e4 am 234474d5: am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '234474d565e668935a97bc6719ddee5c6d8d8b43':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:34:06 +00:00
Andrew Solovay
2e10cc9021 Merge "docs: Fixed error in code sample." into klp-docs 2014-06-04 17:32:46 +00:00
Ricardo Cervera
234474d565 am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '693a954626866e40b01264ff57fe6c336a7504a8':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:29:36 +00:00
Tim Murray
fdb15a76a3 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-04 10:25:54 -07:00
Ricardo Cervera
693a954626 am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 
* commit '6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
  docs: Added release notes for SDK Tools 22.6.4
 2014-06-04 17:24:35 +00:00
Ricardo Cervera
6e949d9ca5 Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs 2014-06-04 17:21:39 +00:00
Hector Dearman
13d6cfb3b5 Merge "Removes bad comment from CookieManager" 2014-06-04 17:12:36 +00:00
Robert Greenwalt
4806c12711 am e8f910c6: Fix Legacy NetworkInfo API 
* commit 'e8f910c635710e4b2d7f299ba33f6205cc4371e3':
  Fix Legacy NetworkInfo API
 2014-06-04 17:03:25 +00:00
Jorim Jaggi
43cb6b1a45 am ec90358d: Improve hint animations. 
* commit 'ec90358dbca10cdc6a162ef42baddbf509614f14':
  Improve hint animations.
 2014-06-04 17:03:18 +00:00
Jorim Jaggi
1b002210e1 am b1c204fe: Hint for phone and camera. 
* commit 'b1c204fe534cc17a8a801e50a83ab747e94d4472':
  Hint for phone and camera.
 2014-06-04 17:03:12 +00:00
Jorim Jaggi
bff6251f43 am a573bcb6: Hide phone/camera affordance when unlocking. 
* commit 'a573bcb69bae182da33f3a7be830eaf9995f817e':
  Hide phone/camera affordance when unlocking.
 2014-06-04 17:03:05 +00:00
Adrian Roos
542681732b am 8d0c8451: (-s ours) Merge "Disable now defunct touch analysis facility - DO NOT MERGE" into lmp-preview-dev 
* commit '8d0c84512cb1d1fa7b2be072df0b8d9c1e16d837':
  Disable now defunct touch analysis facility - DO NOT MERGE
 2014-06-04 17:03:01 +00:00
Jungshik Jang
cebb5d1b4b am 20909bb0: (-s ours) Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev 
* commit '20909bb03bf636c6168ad19ccb481c7961fdb8a4':
  DO NOT MERGE: Added missing entries in the cec device array
 2014-06-04 17:02:32 +00:00
Evan Charlton
065ec0f7ae am 44f3a86a: (-s ours) Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev 
* commit '44f3a86a67fc46065c1d17c1048694e880b87b30':
  Revert sendEnvelope changes [DO NOT MERGE]
 2014-06-04 17:02:10 +00:00
Wei Wang
2fabda1906 am 283a2233: Merge "Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925." into lmp-preview-dev 
* commit '283a223371df58274fdc4380f9710511775eecc5':
  Add device capability config for new BLE features(MA, scan filter).(1/3) Fixes b/15387925.
 2014-06-04 17:02:02 +00:00