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

88650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
14012e1d1b am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:32:02 -07:00
Daniel Sandler
6b2d41966a am 50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev 
* commit '50e1f9eb9333451f0e07b1878b5a78bbcdec27ab':
  Final icon for (Day)dreams.
 2012-10-29 13:31:55 -07:00
Chris Wren
592f634372 am f0fd172a: lock out clicks while switching. 
* commit 'f0fd172a7d4a71da413e5bb6aad9ef611ce2a837':
  lock out clicks while switching.
 2012-10-29 13:31:52 -07:00
John Spurlock
ee12f5aa57 am 47cde77b: Fix camera bugs found overnight. 
* commit '47cde77bc7ac5c3a1e486691596a7534ad855ff2':
  Fix camera bugs found overnight.
 2012-10-29 13:31:48 -07:00
Adam Powell
300772e6f8 am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider 
* commit '6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73':
  Integrate assets from UX; drag/bouncer animation behavior in slider
 2012-10-29 13:31:40 -07:00
Jim Miller
3dd3a41aab am 9b1db682: Fix issue where security view sometimes doesn\'t show. 
* commit '9b1db682c32d103974b0f1193b50e77e254d5589':
  Fix issue where security view sometimes doesn't show.
 2012-10-29 13:31:36 -07:00
Jim Miller
c8896dab51 am a71984f3: Cleanup keyguard signals 
* commit 'a71984f3da47c6e6e3164c170735362a3222d3ad':
  Cleanup keyguard signals
 2012-10-29 13:31:30 -07:00
Michael Jurka
b1c5ec176d am 1254f2f4: Persist reordering/deleting widgets on keyguard 
* commit '1254f2f42f7173ef51d0034975ab5cb7d44f8209':
  Persist reordering/deleting widgets on keyguard
 2012-10-29 13:31:27 -07:00
Robert Ly
1de0549fd6 am 6a8d6da9: am 148d4131: am 5b45e337: am d6bbf71d: am ea502b27: Merge "docs: animations au class" into jb-dev-docs 
* commit '6a8d6da9bb8829011bcc249e308461ea64e431e1':
 2012-10-29 13:31:23 -07:00
Jim Miller
33e62a8061 am f90716c9: Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev 
* commit 'f90716c9cc9f5ebed9d6bbdae40295490d94890f':
  Route signals from SlidingChalleng to SecurityView
 2012-10-29 13:31:19 -07:00
John Spurlock
3376069578 am 7de482ba: am 5c87f533: Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev 
* commit '7de482babc55f1034d37552a0b254427694b3584':
 2012-10-29 13:31:15 -07:00
Adam Powell
0d980a3b29 am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops 
* commit '0b1b552268bc6641cc5d01fb80c12258da9c6985':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
 2012-10-29 13:31:12 -07:00
Chet Haase
c2b46a02ee am b3975088: am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 
* commit 'b3975088b6f10d45ed5589f10887a4bc12fe942c':
 2012-10-29 13:31:08 -07:00
Daniel Sandler
3e41588b93 am d85a960b: Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev 
* commit 'd85a960b14203f63c7e2b8b16235b60ea1023151':
  Fix Google Now on lockscreen.
 2012-10-29 13:31:04 -07:00
Fabrice Di Meglio
6278f80463 am 654761a0: am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev 
* commit '654761a059f85ced7316e4027a93ba18b5071e0f':
 2012-10-29 13:31:01 -07:00
John Spurlock
eb4c0cb509 am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev 
* commit '2e8a98e269486700d985f842806ce70e3a394dc9':
  Manual frameworks/base merge from lockhotness (camera).
 2012-10-29 13:30:56 -07:00
Svetoslav Ganov
f78367e2d2 am e3b51ef0: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev 
* commit 'e3b51ef0022187aeb0e39f332a3c693dcfcdf625':
 2012-10-29 13:30:53 -07:00
Daniel Sandler
25c0e69287 am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev 
* commit 'c57f0d3e540f916f629d160148231bb38d3deb64':
  Haptics for PIN enter key
 2012-10-29 13:30:48 -07:00
Daniel Sandler
b6890d3412 am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev 
* commit '40d98edb43e3e897b1db4ac9f47bb522f585d3a5':
  Haptics for PIN keys.
 2012-10-29 13:30:45 -07:00
Bryan Mawhinney
033afa8c81 am 661c2e74: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev 
* commit '661c2e7495955f063ce0108ec2d76164fd75bec5':
 2012-10-29 13:30:41 -07:00
Daniel Sandler
165303f645 am d5692742: PIN pad cosmetics. 
* commit 'd5692742c1ff056e9fe55a495632229c86ed5384':
  PIN pad cosmetics.
 2012-10-29 13:30:36 -07:00
Daniel Sandler
51b0919d30 am 2c1ce056: Cleaning up password input. 
* commit '2c1ce0564fbd329e9e9ccfca100c69cfc1fd2645':
  Cleaning up password input.
 2012-10-29 13:30:32 -07:00
Daniel Sandler
9e126b9251 am 51d39f2d: Add ECA to PIN view 
* commit '51d39f2df9ed787644290fbff49b3a8282444c9a':
  Add ECA to PIN view
 2012-10-29 13:30:28 -07:00
Jim Miller
cc5abfd4d6 am df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev 
* commit 'df99b1d5d34c69f1a2e4490dadae5e69a0dd5a72':
  Fix new password view in keyguard
 2012-10-29 13:30:24 -07:00
Michael Jurka
fc00e67cb0 am 8b3dd400: Fix build 
* commit '8b3dd40019db2c5744b3adceb75a231311bc00b7':
  Fix build
 2012-10-29 13:30:20 -07:00
Michael Jurka
e88eebbb3b am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev 
* commit '147dfc8642ecbdce527d18bdbeece7b7d05dc883':
  Adding ability to add multiple widgets to keyguard
 2012-10-29 13:30:16 -07:00
Dianne Hackborn
62778aaa03 am db3efba6: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev 
* commit 'db3efba6fc3a71cfd0a6406704970f1bcb13242f':
 2012-10-29 13:30:09 -07:00
Daniel Sandler
4dc794a779 am 5fbc82ef: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev 
* commit '5fbc82ef79277d14444549098147ecea69caf6a6':
 2012-10-29 13:30:04 -07:00
Adam Powell
662bf7b23e am eee20931: Beginnings of bouncer support; add scrims and state tracking 
* commit 'eee209313d564be37b8fc068f785b3844cd6597e':
  Beginnings of bouncer support; add scrims and state tracking
 2012-10-29 13:30:00 -07:00
Irfan Sheriff
446e66edd8 am 9253f561: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev 
* commit '9253f56163a7b88a09bc4347ba6fe631dd7a08d8':
 2012-10-29 13:29:57 -07:00
Jeff Brown
0234e9db97 am 2ca85c20: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 
* commit '2ca85c20517037a86fd59eba7946267dd49b4c61':
 2012-10-29 13:29:47 -07:00
Adam Powell
82da5b173c am c0657fb3: Integrate changes from lockscreen proto app 
* commit 'c0657fb36ce5ede652e8af084e484d07abfb449d':
  Integrate changes from lockscreen proto app
 2012-10-29 13:29:43 -07:00
Romain Guy
b18e19f5a0 am ee0f615f: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev 
* commit 'ee0f615ffdbb790a6bb64b0efe444b4c7f8fe291':
 2012-10-29 13:29:40 -07:00
Baligh Uddin
38f7ae14df am f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'f785af4d2ed49b8bf947df28d77b6c9b7cf1611d':
  Import translations. DO NOT MERGE
 2012-10-29 13:29:36 -07:00
Baligh Uddin
511e3874ff am a187b478: (-s ours) am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'a187b478b6d19daa39c2879c434fea7fba463c0d':
 2012-10-29 13:25:43 -07:00
Amith Yamasani
9b083fd87b am 599885d5: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 
* commit '599885d5308992b2554993903b717c5f0eb5b6a8':
 2012-10-29 12:46:28 -07:00
Chris Wren
0d3215c24c am f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev 
* commit 'f0cec427a4f73bda130eda98c2a7f70e44ff587b':
  remove debug logs.
 2012-10-29 12:46:24 -07:00
Victoria Lease
de877ac28d am 405e6746: am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev 
* commit '405e6746c671a41742581fa1313ca6d52f3484c7':
 2012-10-29 12:46:20 -07:00
Adam Cohen
f2344e087c am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 
* commit 'a9f166695b92e91ea6bb13a41f3aa1fb3f6ee77c':
  Fading side pages as per mock
 2012-10-29 12:46:16 -07:00
Chris Wren
a90f82fc10 am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev 
* commit 'ff8722574ee335453845c3dc04435a20dc94a99b':
  catch exceptional cases on factory-fresh devices.
 2012-10-29 12:46:13 -07:00
Christopher Tate
d56476e205 am 698e144f: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit '698e144f70ff1482452922f159789c2f24a5162c':
 2012-10-29 12:46:09 -07:00
Baligh Uddin
ea2078e82f am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '985dc142642c43e54c15a436027a11d9b61ab3d8':
  Import translations. DO NOT MERGE
 2012-10-29 12:46:05 -07:00
Baligh Uddin
b7ac4cbe50 am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2171fa1cd3be23fba4d3be077ff0cd6521762107':
 2012-10-29 12:46:00 -07:00
Jeff Brown
9b687f45d0 am d9fb5848: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit 'd9fb5848c8f049b1b2e08b415e40e08de814c5e5':
 2012-10-29 12:45:56 -07:00
Zhihai Xu
1bab04356e am 11181c7a: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '11181c7ae6a9f8278fbf99676b3476173b18b098':
 2012-10-29 12:45:52 -07:00
Dirk Dougherty
9b9d4e0676 am 7833ea17: am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit '7833ea17ad32fcb012b27c32b3be946e86f35e19':
 2012-10-29 12:45:49 -07:00
Dianne Hackborn
98385f8465 am cc9106bb: am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit 'cc9106bb7ae91affb4c5cd489a29f1971eca5974':
 2012-10-29 12:45:45 -07:00
Dave Burke
dfe05a5e11 am 4d56a167: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 
* commit '4d56a16728b21b2825500c24b5af1b4e0573a15e':
 2012-10-29 12:45:41 -07:00
Eric Laurent
6b6d896b7b am 22df26ca: am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 
* commit '22df26cac2e9a2215e7a8af9f1b7444aac08992d':
 2012-10-29 12:45:37 -07:00
Kenny Root
c9cc6e5a53 am 16106a76: am 92bc9b31: PMS: check outInfo for null during delete 
* commit '16106a7641bac1590476459d9e349ab18f4ca44c':
 2012-10-29 12:45:34 -07:00