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

148346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Adrian Roos
6b43ad6853 am e23ab08f: Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev 
* commit 'e23ab08fe7ddeb9062392aa526faf487be7462f3':
  Fix pending dismiss action not cleared when leaving bouncer
 2014-08-07 20:42:50 +00:00
Alan Viverette
85f5303dcc am 2dac0ad7: Merge "Add an extra pixel to the ripple radius used for bounds" into lmp-dev 
* commit '2dac0ad754b8ccb910e76ed7136e40814006c1c3':
  Add an extra pixel to the ripple radius used for bounds
 2014-08-07 20:42:43 +00:00
Eino-Ville Talvala
5609c1cf0f am 90952cfd: Merge topic \'camera2-remove-hidden\' into lmp-dev 
* commit '90952cfdb43e769da1a177e294973e3aacca12eb':
  Camera2: Fix session shutdown race, frequent warning log
  Camera2: Remove hidden parts of public CameraDevice
  Camera2: Fix null-listener capture for CameraCaptureSession
 2014-08-07 20:20:14 +00:00
Jason Monk
d696634fe5 am 881f8547: Update strings for QS footer. 
* commit '881f8547013a84ac878f115e12c35c15e6727081':
  Update strings for QS footer.
 2014-08-07 20:20:10 +00:00
Michael Wright
cd4750dd60 am 97b2b671: Allow media projections to create public presentations. 
* commit '97b2b67155910079d122ecb1d2bc69c42d8e24c4':
  Allow media projections to create public presentations.
 2014-08-07 20:11:58 +00:00
Jason Monk
d3ea7d61a3 Update strings for QS footer. 
Bug: 16854706
Change-Id: Iba7ecae45f0bc9a8819f5172ad5922fddab95076
 2014-08-07 20:09:39 +00:00
Michael Wright
6720be4e8c Allow media projections to create public presentations. 
Change-Id: I3b6e0b54d658352942a38be6a24486bdfc179efd
 2014-08-07 20:07:04 +00:00
Prerepa Viswanadham
af3dec5e72 am 2792be93: OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost. 
* commit '2792be930bb082fcd18ab47ea60fc723396144ba':
  OnLost/OnFound integration - onfound match is done in framework, whereas hw signal is used to report onlost.
 2014-08-07 19:57:10 +00:00
Prerepa Viswanadham
d5324e4183 OnLost/OnFound integration - onfound match is done in framework, 
whereas hw signal is used to report onlost.

Bug 16733710

Change-Id: I7b177b7afd730341c336818857436c095735b53b
 2014-08-07 19:51:59 +00:00
Christopher Tate
a95cd4e50d am bc835105: Merge "Reify the transport lookup/selection API" into lmp-dev 
* commit 'bc835105066725fecfe378bfdd13c2262908457f':
  Reify the transport lookup/selection API
 2014-08-07 19:48:44 +00:00
Christopher Tate
6a3a2d5a90 am d9f038c1: Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev 
* commit 'd9f038c1dc29d7a73c1888b83b7e7c1f643ffa0c':
  Make TrafficStats uid attribution @SystemApi
 2014-08-07 19:48:40 +00:00
Christopher Tate
deec962ece am f671005b: Introduce system API for distinguishing the owner user 
* commit 'f671005b75b3d603fb664afb64576c7c59cb5387':
  Introduce system API for distinguishing the owner user
 2014-08-07 19:48:36 +00:00
Dianne Hackborn
151c4eb4d3 am c8c42a7c: Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 
* commit 'c8c42a7cab25d1d7e5c774dfaa9241131cb4eb15':
  Fix to call VoiceInteractionSession.onDestroy().
 2014-08-07 19:44:26 +00:00
Christopher Tate
cbd7a6ecbb Introduce system API for distinguishing the owner user 
Support services that special case the owner but are instantiated
per-user, and so need to be able to distinguish.

Bug 16661321

Change-Id: I7ff5168c91e39821317fdf5cfaba34e90d30de95
 2014-08-07 19:43:17 +00:00
Behdad Esfahbod
ab42b32fb9 am 7dc6dcd4: Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 
* commit '7dc6dcd417c23159047082a891288775b9e778b2':
  Remove dependency on SkPaintOptionsAndroid
 2014-08-07 19:36:43 +00:00
Dianne Hackborn
7adcb6defe am e46717b6: Fix issue @16555033: Battery history overflowing too much 
* commit 'e46717b661b685cc1586a59f00cd6cf10822896b':
  Fix issue @16555033: Battery history overflowing too much
 2014-08-07 19:24:12 +00:00
Dianne Hackborn
0068d3dcf1 Fix issue @16555033: Battery history overflowing too much 
- No longer track process starts/stops normally.
- Increase buffer size to 256KB.
- Buffer size increase requires reworking how battery stats
  are retrieved, since it is going to be hitting IPC limits.
- Also, store the last full stats after a reset, to be reported
  at the next checkin.
- Also, discharge and charge times are tagged with the screen
  and battery save state during that time.

Change-Id: Ie108ac9b626846108a9bb858101ac2b93276ac16
 2014-08-07 12:19:39 -07:00
Sandeep Siddhartha
374b13dc23 am f52031b2: Dump the state of SoundTriggerHelper for bugreports 
* commit 'f52031b22e8979cb54b840f8bec3346fb53ec561':
  Dump the state of SoundTriggerHelper for bugreports
 2014-08-07 19:17:52 +00:00
Sandeep Siddhartha
e496b54dfe am 53f4a335: Merge "Handle microphone contention/Phone calls while recognition is active" into lmp-dev 
* commit '53f4a3359cc21ef20844759c2788c4b9d1a0cc73':
  Handle microphone contention/Phone calls while recognition is active
 2014-08-07 19:13:46 +00:00
Sandeep Siddhartha
6b8556d2e3 Dump the state of SoundTriggerHelper for bugreports 
Change-Id: I01a17d969fbd22c6bcbb161e3542ca14a3f8c7c8
 2014-08-07 12:10:48 -07:00
Winson Chung
c51d50c4db am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'e70eb503d1798fe391eae9c84050092e510234fc':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:07:42 +00:00
Glenn Kasten
4552829ae0 am fc752425: am cd55d2e5: Merge "Add setting to disable automatic USB audio routing" into lmp-dev 
* commit 'fc7524257aedf685908528c778843294d4e07da1':
  Add setting to disable automatic USB audio routing
 2014-08-07 19:07:37 +00:00
Sandeep Siddhartha
4d72ebe642 am 7e0e4515: am e931a72d: Handle same keyphrase for multiple users 
* commit '7e0e4515db07858254c04a2a347b4758689d4615':
  Handle same keyphrase for multiple users
 2014-08-07 19:07:32 +00:00
Sandeep Siddhartha
6c10af5c2c am 84e8121f: am b6c0b037: Merge "Read audio format from the recognition event" into lmp-dev 
* commit '84e8121f7bc0b5981052462800e5e35b18876d87':
  Read audio format from the recognition event
 2014-08-07 19:07:27 +00:00
Adam Powell
e5d01bf717 am 0ae66be2: am 157fab0c: Nested pre-fling for AbsListView and ScrollView 
* commit '0ae66be2d2e78be5f3b21f1592ee421c10ac5ca3':
  Nested pre-fling for AbsListView and ScrollView
 2014-08-07 19:07:02 +00:00
Dianne Hackborn
df192a47fc Merge "Fix to call VoiceInteractionSession.onDestroy()." into lmp-dev 2014-08-07 18:53:12 +00:00
Dianne Hackborn
9a35d78cad Fix to call VoiceInteractionSession.onDestroy(). 
Change-Id: I2b4f19538700c691dac3a83aadfa0959ef1fe458
 2014-08-07 12:34:37 -07:00
Adrian Roos
95202de09d Merge "Fix pending dismiss action not cleared when leaving bouncer" into lmp-dev 2014-08-07 18:49:59 +00:00
Adrian Roos
559b41f424 Fix pending dismiss action not cleared when leaving bouncer 
Bug: 16307958
Change-Id: Id9ae360b6d4f606b3b76a092b32756ac04d06344
 2014-08-07 22:27:56 +02:00
Behdad Esfahbod
ec2332121b Merge "Remove dependency on SkPaintOptionsAndroid" into lmp-dev 2014-08-07 18:49:59 +00:00