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

94142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
658da63ffd am 36e37990: (-s ours) am 511e3874: am a187b478: (-s ours) am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '36e37990826c9d5708d9efb50b184827eba4c93f':
 2012-10-29 13:30:49 -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
36e3799082 am 511e3874: am a187b478: (-s ours) am 188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '511e3874ff9759a5ed1612fb21ef38947a3fd71f':
 2012-10-29 13:27:46 -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
fccf7f11d2 am 13419b16: am 9b083fd8: am 599885d5: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 
* commit '13419b16783e393f491616987cb8d374f4ebc993':
 2012-10-29 12:53:55 -07:00
Chris Wren
aa461dbdd7 am bdaab675: am 0d3215c2: am f0cec427: Merge "remove debug logs." into jb-mr1-lockscreen-dev 
* commit 'bdaab6750b040810ca26ddac59a9f2ce72615a23':
  remove debug logs.
 2012-10-29 12:53:51 -07:00
Victoria Lease
93fd13a524 am 2ab45620: am de877ac2: am 405e6746: am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev 
* commit '2ab45620f3948472428e61938674c40df2adec7c':
 2012-10-29 12:53:47 -07:00
Adam Cohen
1a77671114 am 6f02456e: am f2344e08: am a9f16669: Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 
* commit '6f02456e75e1aa1cc4cac593c3060a46761f0f31':
  Fading side pages as per mock
 2012-10-29 12:53:44 -07:00
Chris Wren
46566b30b6 am afa8b7ba: am a90f82fc: am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev 
* commit 'afa8b7ba41c131d1862d1a24a08c9ffcd162a47f':
  catch exceptional cases on factory-fresh devices.
 2012-10-29 12:53:40 -07:00
Christopher Tate
9b692e8b2a am 8a804510: am d56476e2: am 698e144f: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit '8a8045105893566eda3c111bedfd9e3cda027559':
 2012-10-29 12:53:36 -07:00
Baligh Uddin
e8ac3e7a86 am b7565416: (-s ours) am ea2078e8: am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'b7565416d837bfa031e7a926926d0c458fd6b396':
  Import translations. DO NOT MERGE
 2012-10-29 12:53:32 -07:00
Baligh Uddin
f2546b959c am 98c56ebc: (-s ours) am b7ac4cbe: am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '98c56ebcba418fc4d84325e1394b324422ca18ae':
 2012-10-29 12:53:29 -07:00
Jeff Brown
bf16942c86 am 6e67dc10: am 9b687f45: am d9fb5848: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '6e67dc10e5d42174d572cad5d3c3ae677e52f6b6':
 2012-10-29 12:53:24 -07:00
Zhihai Xu
03318f5838 am 2cef1e60: am 1bab0435: am 11181c7a: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '2cef1e60341b3b88e48dd47a8b7228582019af92':
 2012-10-29 12:53:21 -07:00
Dirk Dougherty
9a03b3fa2c am 38ff7a0d: am 9b9d4e06: am 7833ea17: am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit '38ff7a0def952dd12842b93b82e8db768b62a9d6':
 2012-10-29 12:53:17 -07:00
Dianne Hackborn
986121d0c8 am 324a8e17: am 98385f84: am cc9106bb: am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit '324a8e1779741be432519e7516ebb110b91984d8':
 2012-10-29 12:53:13 -07:00
Dave Burke
8af4c35c63 am 8bd6a5a8: am dfe05a5e: am 4d56a167: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 
* commit '8bd6a5a891f7411e50aa9767a8d168ea73573adb':
 2012-10-29 12:53:09 -07:00
Eric Laurent
c50d7c8574 am 51d35210: am 6b6d896b: am 22df26ca: am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 
* commit '51d352105b8173b7e9b4fdaf98622caaca03f00d':
 2012-10-29 12:53:06 -07:00
Kenny Root
a74b4aa812 am a4be6a1a: am c9cc6e5a: am 16106a76: am 92bc9b31: PMS: check outInfo for null during delete 
* commit 'a4be6a1aa113d884e1cbf76e4a2222765fd96068':
 2012-10-29 12:53:01 -07:00
Dianne Hackborn
c19213ca37 am 1746160d: am f650447c: am a4dcf311: am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev 
* commit '1746160dd63e9e02d5db06a19a458bca684fa1df':
 2012-10-29 12:52:55 -07:00
Svetoslav Ganov
f08d2efc54 am 5006ef21: am 0223483d: am 40ca868a: am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 
* commit '5006ef2165df6f0187dbc6653fa2df99fefbd5d9':
 2012-10-29 12:52:48 -07:00
John Spurlock
9e1f1a8e84 am 8a109dba: am 8c480e4b: am 86b6357e: Manual f/b merge of lockhotness camera integration. 
* commit '8a109dba86857853b3351b3a7f41150629b494ad':
  Manual f/b merge of lockhotness camera integration.
 2012-10-29 12:52:42 -07:00
Adam Powell
226b55f516 am c1a034aa: am 7e83e339: am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 
* commit 'c1a034aa93d86aa2592876c13fdf4066887f37c3':
  Fix up GlowPadView attributes
 2012-10-29 12:52:38 -07:00
Jim Miller
aa557e5c25 am 0e0d6fba: am 412b6a5e: am 19a52670: Merge latest prototype changes into keyguard 
* commit '0e0d6fbab4d1f3e19718f251baab9f2da13e57d4':
  Merge latest prototype changes into keyguard
 2012-10-29 12:52:35 -07:00
Kenny Root
d43aa49c51 am 2721e7ed: am f834fb33: am 356f2f59: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 
* commit '2721e7edc6c8b570ff12f98562df03dd55b1fbe0':
 2012-10-29 12:52:31 -07:00
Craig Mautner
3e69493602 am 3e394a2e: am ae2a3c77: am ce1696c2: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit '3e394a2edd32ca04371cdbb91d06c2db9afabf12':
 2012-10-29 12:52:27 -07:00
Hiroshi Lockheimer
069829b27e am c02fda2c: am 50920f5f: am 5c731480: am c63aa962: Merge "Fix NPE." into jb-mr1-dev 
* commit 'c02fda2c46b039f29c6493abd31d4e3a888ec3d9':
 2012-10-29 12:52:23 -07:00
Chet Haase
583a2021cc am 7ffdb1ea: am cc0696e5: am 4a4ae0b7: am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev 
* commit '7ffdb1eab225ac017f578f68e538f1e78bd34452':
 2012-10-29 12:52:19 -07:00
Romain Guy
cc29cc392f am 48a43a1a: am 773f299f: am aae03bb4: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev 
* commit '48a43a1a61f3391da2233888ec1543ae57fd883a':
 2012-10-29 12:52:15 -07:00
Danielle Millett
7898fda7f4 am 1c41939d: am 5cba537a: am 7c420ec6: Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev 
* commit '1c41939d8a1bb92d06d63d7c937d77539b61e290':
  Handling popups correctly for face unlock
 2012-10-29 12:52:11 -07:00
Jamie Gennis
b817658480 am 160af786: am 1a5ddfdf: am 0e259dcc: am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 
* commit '160af786caf8bd1d32eaed5f50ca05a7cbe61c94':
 2012-10-29 12:52:07 -07:00