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

148970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
c81ae53ba9 am 94235b4e: am 95df7b92: am 343a5652: Merge "Launch application details for correct profile from recents." into lmp-dev 
* commit '94235b4eb8e10876c881667095000fcc8fc049e7':
  Launch application details for correct profile from recents.
 2014-08-08 02:23:52 +00:00
Christopher Tate
b6ec78c0df am 2e7baac4: am 5067a1d8: am 3357b644: Merge "Sanity-check paths of files to be restored" into lmp-dev 
* commit '2e7baac41430f0494364bcc3217e9053756ad9dc':
  Sanity-check paths of files to be restored
 2014-08-08 02:23:46 +00:00
Alan Viverette
c606700da0 am 6d24c16b: am fac7efbe: am c7836ba9: Merge "Fix CTS test for nine patch padding sanity check" into lmp-dev 
* commit '6d24c16bdee940609cce2064da0403dd589b036c':
  Fix CTS test for nine patch padding sanity check
 2014-08-08 02:23:42 +00:00
Igor Murashkin
f902824b6a am 9d08824c: am 5ca53000: am 89b3f042: Merge "camera2: (LEGACY) Add face detection support and vstab modes" into lmp-dev 
* commit '9d08824c6babde2a0f212ee95e6ce251c20a3d85':
  camera2: (LEGACY) Add face detection support and vstab modes
 2014-08-08 02:23:37 +00:00
Alan Viverette
60c3327b22 am 5d56ffb6: am 74047e65: am 50baf1fd: Merge "Remove clipToOutline workaround for null backgrounds" into lmp-dev 
* commit '5d56ffb6d2e9cf3e75e06901badec9b798f7a71c':
  Remove clipToOutline workaround for null backgrounds
 2014-08-08 02:23:32 +00:00
Alan Viverette
f0293d0b98 am d622d821: am 6f7b6892: am 515ed510: Merge "Use translatable strings for time picker AM/PM labels" into lmp-dev 
* commit 'd622d821ac8e40e170b9973e0e563c70da66e504':
  Use translatable strings for time picker AM/PM labels
 2014-08-08 02:23:28 +00:00
Adrian Roos
cd27c001cd am 375b47d8: am b25fc7a3: am e23ab08f: Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev 
* commit '375b47d8cee425b47f6df28fce0f0870f9dac0a2':
  Fix pending dismiss action not cleared when leaving bouncer
 2014-08-08 02:23:10 +00:00
Alan Viverette
e5817f34bf am d71d4fbe: am 87f91eb7: am 2dac0ad7: Merge "Add an extra pixel to the ripple radius used for bounds" into lmp-dev 
* commit 'd71d4fbef29f67f619debcd346a65a0aa2288a3c':
  Add an extra pixel to the ripple radius used for bounds
 2014-08-08 02:23:06 +00:00
Eino-Ville Talvala
00d5e0edec am b8aecd1c: am af5eec3d: am 90952cfd: Merge topic \'camera2-remove-hidden\' into lmp-dev 
* commit 'b8aecd1ccd19439c7a0623adff79fe730bed908d':
  Camera2: Fix session shutdown race, frequent warning log
  Camera2: Remove hidden parts of public CameraDevice
  Camera2: Fix null-listener capture for CameraCaptureSession
 2014-08-08 02:22:59 +00:00
Jason Monk
4f3016230c am caae87ec: am 576e4f14: am 881f8547: Update strings for QS footer. 
* commit 'caae87ecb5c931255ea78cdbc7340dcc6276cf54':
  Update strings for QS footer.
 2014-08-08 02:22:50 +00:00
Michael Wright
cd0e704bb5 am 8f32bb1e: am 44af6db6: am 97b2b671: Allow media projections to create public presentations. 
* commit '8f32bb1e7ad2d5690c0328e6d38bce6841a6059b':
  Allow media projections to create public presentations.
 2014-08-08 02:22:43 +00:00
Prerepa Viswanadham
e30c840bc4 am 94294b1c: am 33813e73: am 2792be93: OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost. 
* commit '94294b1cbf1db48cc7ed24d6aa5c2274ce1cebc1':
  OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost.
 2014-08-08 02:22:38 +00:00
Christopher Tate
a589f12c34 am b39bc60c: am 6fb63e97: am bc835105: Merge "Reify the transport lookup/selection API" into lmp-dev 
* commit 'b39bc60c4a255a6dd4eaa3e4b92394bff22ac4d3':
  Reify the transport lookup/selection API
 2014-08-08 02:22:33 +00:00
Christopher Tate
6c7ec13836 am 8131a5dd: am 1a0066b6: am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 
* commit '8131a5dd42e441420cf99b99e152ee1510feabf2':
  Make TrafficStats uid attribution @SystemApi
 2014-08-08 02:22:23 +00:00
Christopher Tate
931535cbc7 am 3755910a: am 9d24d44e: am f671005b: Introduce system API for distinguishing the owner user 
* commit '3755910ad680f88d3eb5d3db78a2fd5e9b36cebb':
  Introduce system API for distinguishing the owner user
 2014-08-08 02:22:16 +00:00
Dianne Hackborn
bd0e0e2ed6 am 23a2f922: am f1de7d98: am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 
* commit '23a2f922fadade5a29ff93a2c304b6c89eeaa84f':
  Fix to call VoiceInteractionSession.onDestroy().
 2014-08-08 02:22:11 +00:00
Behdad Esfahbod
ce97d6df5c am e7433ed8: am 037eb8eb: am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 
* commit 'e7433ed88cb2ce7d103824e726ec93f6b8dbf75d':
  Remove dependency on SkPaintOptionsAndroid
 2014-08-08 02:22:05 +00:00
Dianne Hackborn
5a6aaf7bcf am d9b3fab2: am d741140f: am e46717b6: Fix issue @16555033: Battery history overflowing too much 
* commit 'd9b3fab2bdd9c0c42807d03e8b133deb7337bfb3':
  Fix issue @16555033: Battery history overflowing too much
 2014-08-08 02:21:57 +00:00
Sandeep Siddhartha
7d5e5c7901 am ba40dca5: am d54fa323: am f52031b2: Dump the state of SoundTriggerHelper for bugreports 
* commit 'ba40dca5260f0f3fe20f51c503e545b7ee5c6df0':
  Dump the state of SoundTriggerHelper for bugreports
 2014-08-08 02:21:53 +00:00
Sandeep Siddhartha
140dd87333 am 22a3c9e6: am 9ac2891f: am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 
* commit '22a3c9e6d899197f772837dabb810a539d3782ac':
  Handle microphone contention/Phone calls while recognition is active
 2014-08-08 02:21:46 +00:00
Santos Cordon
64a2ad1a36 am 92d07514: am febe4691: am b24368ea: Remove ldaps from AOSP code. 
* commit '92d07514f90d769cf6b6c6bf27b3c6474691c1cd':
  Remove ldaps from AOSP code.
 2014-08-08 02:21:39 +00:00
Sandeep Siddhartha
a8054cfe3c am 73d5dc67: am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '73d5dc67665778a5cf01dc0cb0d586e57834c991':
  Fix build break
 2014-08-08 02:21:29 +00:00
Kenny Guy
470ac08554 am 95df7b92: am 343a5652: Merge "Launch application details for correct profile from recents." into lmp-dev 
* commit '95df7b920a5a31038e9e007bae523ca72654df1f':
  Launch application details for correct profile from recents.
 2014-08-08 00:55:48 +00:00
Christopher Tate
4994ca5366 am 5067a1d8: am 3357b644: Merge "Sanity-check paths of files to be restored" into lmp-dev 
* commit '5067a1d83d97c00c5831077c3eea5b724d59b792':
  Sanity-check paths of files to be restored
 2014-08-08 00:55:42 +00:00
Alan Viverette
29ee7e41fc am fac7efbe: am c7836ba9: Merge "Fix CTS test for nine patch padding sanity check" into lmp-dev 
* commit 'fac7efbe5cb720b6a48c7bdc67d710e2700c19c4':
  Fix CTS test for nine patch padding sanity check
 2014-08-08 00:55:38 +00:00
Igor Murashkin
e0bb015f19 am 5ca53000: am 89b3f042: Merge "camera2: (LEGACY) Add face detection support and vstab modes" into lmp-dev 
* commit '5ca53000e05ff021381baea4c7c65e091ec31080':
  camera2: (LEGACY) Add face detection support and vstab modes
 2014-08-08 00:55:31 +00:00
Alan Viverette
118b716f1c am 74047e65: am 50baf1fd: Merge "Remove clipToOutline workaround for null backgrounds" into lmp-dev 
* commit '74047e659551bf525027fc59690ca14b6e50c992':
  Remove clipToOutline workaround for null backgrounds
 2014-08-08 00:55:25 +00:00
Alan Viverette
3a86545e93 am 6f7b6892: am 515ed510: Merge "Use translatable strings for time picker AM/PM labels" into lmp-dev 
* commit '6f7b689294309d12a55e4a39757de89af3ac862a':
  Use translatable strings for time picker AM/PM labels
 2014-08-08 00:55:18 +00:00
Adrian Roos
832ce6ade5 am b25fc7a3: am e23ab08f: Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev 
* commit 'b25fc7a30479a56273203934b531845083b22125':
  Fix pending dismiss action not cleared when leaving bouncer
 2014-08-08 00:55:13 +00:00
Alan Viverette
9bc5f4a81d am 87f91eb7: am 2dac0ad7: Merge "Add an extra pixel to the ripple radius used for bounds" into lmp-dev 
* commit '87f91eb7857ec22c7fb3575d1b10481f8881ca79':
  Add an extra pixel to the ripple radius used for bounds
 2014-08-08 00:55:09 +00:00
Eino-Ville Talvala
a28e78ed6c am af5eec3d: am 90952cfd: Merge topic \'camera2-remove-hidden\' into lmp-dev 
* commit 'af5eec3df2502004471e4bb07201c161b46ed3f9':
  Camera2: Fix session shutdown race, frequent warning log
  Camera2: Remove hidden parts of public CameraDevice
  Camera2: Fix null-listener capture for CameraCaptureSession
 2014-08-08 00:55:00 +00:00
Jason Monk
703f9498b8 am 576e4f14: am 881f8547: Update strings for QS footer. 
* commit '576e4f14e9261a5812032a5b5f7d7c21438d0b9d':
  Update strings for QS footer.
 2014-08-08 00:54:55 +00:00
Michael Wright
1bba40f7c7 am 44af6db6: am 97b2b671: Allow media projections to create public presentations. 
* commit '44af6db671f30a3a077adb4505d8c13e19b03f4d':
  Allow media projections to create public presentations.
 2014-08-08 00:54:48 +00:00
Prerepa Viswanadham
aeac440af5 am 33813e73: am 2792be93: OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost. 
* commit '33813e73dbda5dc515621ca90a4d3753cba055f4':
  OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost.
 2014-08-08 00:54:41 +00:00
Christopher Tate
b18056a5af am 6fb63e97: am bc835105: Merge "Reify the transport lookup/selection API" into lmp-dev 
* commit '6fb63e97dd6dd2779c7ee18cca0472b87d051ab0':
  Reify the transport lookup/selection API
 2014-08-08 00:54:33 +00:00
Christopher Tate
472eceb23d am 1a0066b6: am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 
* commit '1a0066b6ad98b0bcedd871e2b6543f28fa88e066':
  Make TrafficStats uid attribution @SystemApi
 2014-08-08 00:54:28 +00:00
Christopher Tate
2556096532 am 9d24d44e: am f671005b: Introduce system API for distinguishing the owner user 
* commit '9d24d44ed9f52f274d35b4087003af0b495c4979':
  Introduce system API for distinguishing the owner user
 2014-08-08 00:54:25 +00:00
Dianne Hackborn
009bf3e865 am f1de7d98: am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 
* commit 'f1de7d9868cce90b67d57731a0ebabdb542807b2':
  Fix to call VoiceInteractionSession.onDestroy().
 2014-08-08 00:54:17 +00:00
Behdad Esfahbod
c703ade25c am 037eb8eb: am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 
* commit '037eb8ebe6298effbe93f6681aaa94a474acac31':
  Remove dependency on SkPaintOptionsAndroid
 2014-08-08 00:54:10 +00:00
Dianne Hackborn
67cc9239f9 am d741140f: am e46717b6: Fix issue @16555033: Battery history overflowing too much 
* commit 'd741140fc57c2f9356067fb9f8fc5562cd74bbee':
  Fix issue @16555033: Battery history overflowing too much
 2014-08-08 00:54:03 +00:00
Sandeep Siddhartha
5d4340e2f1 am d54fa323: am f52031b2: Dump the state of SoundTriggerHelper for bugreports 
* commit 'd54fa323e8fa443e4b7f14a0426c678c24ccda04':
  Dump the state of SoundTriggerHelper for bugreports
 2014-08-08 00:53:58 +00:00
Sandeep Siddhartha
d983258136 am 9ac2891f: am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 
* commit '9ac2891f9ece67b93fae0277434340c604bc391d':
  Handle microphone contention/Phone calls while recognition is active
 2014-08-08 00:53:53 +00:00
Santos Cordon
43983b878a am febe4691: am b24368ea: Remove ldaps from AOSP code. 
* commit 'febe469129ecda5daa63ff55b9ce259b0f88ced4':
  Remove ldaps from AOSP code.
 2014-08-08 00:53:36 +00:00
Sandeep Siddhartha
38bbb59676 am 969edb82: am 5885981a: Merge "Fix build break" into lmp-dev 
* commit '969edb82edfafbf49792ca9e383c99697329ab27':
  Fix build break
 2014-08-08 00:53:23 +00:00
Kenny Guy
09f9d6b9fc am 343a5652: Merge "Launch application details for correct profile from recents." into lmp-dev 
* commit '343a56529730019a16bf27fc213a7846ddbb87a6':
  Launch application details for correct profile from recents.
 2014-08-07 21:13:16 +00:00
Christopher Tate
6d1757fb66 am 3357b644: Merge "Sanity-check paths of files to be restored" into lmp-dev 
* commit '3357b644b4c0cd64daaa931d2b5cb403a68d3820':
  Sanity-check paths of files to be restored
 2014-08-07 21:04:21 +00:00
Alan Viverette
ec7265fe12 am c7836ba9: Merge "Fix CTS test for nine patch padding sanity check" into lmp-dev 
* commit 'c7836ba900a386f0548aa6d39e0a97711c72aa48':
  Fix CTS test for nine patch padding sanity check
 2014-08-07 21:04:16 +00:00
Igor Murashkin
2f5bb33cfc am 89b3f042: Merge "camera2: (LEGACY) Add face detection support and vstab modes" into lmp-dev 
* commit '89b3f042a6e82635e60038e5441b685f715e56a5':
  camera2: (LEGACY) Add face detection support and vstab modes
 2014-08-07 20:56:12 +00:00
Alan Viverette
1081fa6a20 am 50baf1fd: Merge "Remove clipToOutline workaround for null backgrounds" into lmp-dev 
* commit '50baf1fd9d651db643204b0871231160b8be96d9':
  Remove clipToOutline workaround for null backgrounds
 2014-08-07 20:51:46 +00:00
Alan Viverette
77ef7abc5c am 515ed510: Merge "Use translatable strings for time picker AM/PM labels" into lmp-dev 
* commit '515ed51033859dc8e4d156355de0d9de8ad912b1':
  Use translatable strings for time picker AM/PM labels
 2014-08-07 20:42:55 +00:00