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

92889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
c1ae43ade0 am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'f69320a1f02de3106a26a3911c25be63fcfaf738':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 16:39:16 -08:00
Adam Cohen
b82b3b5754 am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit '3e9cba4f9db96e3b5ba2ab2f9ad7a7ac2549582d':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 16:39:13 -08:00
Adam Cohen
f69320a1f0 Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 2012-11-08 16:36:56 -08:00
Adam Cohen
3e9cba4f9d Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 2012-11-08 16:35:42 -08:00
The Android Open Source Project
167296d70a am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge 
* commit '5c0da20cbe442794d68106c3c5ee8cd88fee9291':
 2012-11-08 15:47:58 -08:00
Dianne Hackborn
e0d454d2e8 am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit '72325cdb65a321df7755ba214efd9be42ce828d5':
  Remove extraneous logs.
 2012-11-08 15:47:46 -08:00
Daniel Sandler
77f2e27e68 am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev 
* commit '9b15f2e57520d89fdd350a23ca97db36c3e5b7ca':
  Don't crash if no ECA.
 2012-11-08 15:47:40 -08:00
Chris Wren
b3e8071d81 am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit 'b1d094ba104f804d152b83517bb7500304f6bae8':
  allow pattern linear layout to manage message_area.
 2012-11-08 15:47:36 -08:00
Daniel Sandler
8d62faea22 am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 
* commit 'c4639949d20077a58f92e675b16d45dabf964b0c':
  Only show the bouncer for the assistant if secure.
 2012-11-08 15:47:33 -08:00
John Spurlock
2a1e6a69a7 am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..." 
* commit '180484115fcf061d6fbb5637d614d7c88d5d8053':
  Address comments from merged "Fix remaining jank in sec..."
 2012-11-08 15:47:29 -08:00
John Spurlock
b99a6b336d am cc60b7dc: am baee9ed5: am 7a73344b: Minimal fix for stuck google now. 
* commit 'cc60b7dc3c2f1cbb8dc9917ec368e8d89cb050e7':
  Minimal fix for stuck google now.
 2012-11-08 15:47:25 -08:00
Jim Miller
fe3d459d9c am bfd17051: am 271add4e: am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev 
* commit 'bfd17051bc9edee6388125efbac2d50b90eab046':
  Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
 2012-11-08 15:47:21 -08:00
Michael Jurka
9d31d103b3 am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets 
* commit '1470297c4d0db5d90785b88c8ddf79119720bd42':
  Enforce max number of 5 lockscreen widgets
 2012-11-08 15:47:17 -08:00
Adam Cohen
5d92a50efd am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 
* commit '06b29549fb9819ed763c401ca471c051805fc7b4':
  Adding user activity when the challenge is slid down
 2012-11-08 15:47:12 -08:00
Jim Miller
b67cba3355 am 2b49dd1c: am 6c7d2c24: am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 
* commit '2b49dd1c6e0bc9e0fee38f4bdf8889cb791ca81e':
  Don't show ECA in landscape mode on phones.
 2012-11-08 15:47:09 -08:00
Jim Miller
061b4fae3d am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 15:47:04 -08:00
Adam Powell
70eeec5c06 am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b':
  add bouncer frame to glowpad.
 2012-11-08 15:46:58 -08:00
Adam Powell
2f63c24e72 am d7aaf3af: am f3eaabb9: am a9fa92e8: Keyguard - force showing the status bar 
* commit 'd7aaf3af31f2f16753883c263eb7812493a3b123':
  Keyguard - force showing the status bar
 2012-11-08 15:46:51 -08:00
Jim Miller
8b26141a6c am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard. 
* commit '670f5a52b0a6c9c74541af06929152a54e53fe8b':
  Disable interactive mode for full-screen security views in keyguard.
 2012-11-08 15:46:47 -08:00
Adam Cohen
ee9bb25a3a am 230719c7: am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev 
* commit '230719c7b5da0d36bd4e475cfba258011ab32d95':
  Clean up some flashy jank (issue 7454766)
 2012-11-08 15:46:39 -08:00
Winson Chung
462222fc5d am 10bcc7d9: am 18825966: am 70c2f873: Synchronizing bouncer duration with page scaling duration. 
* commit '10bcc7d95827884de2131fc316a24c9e6facee1e':
  Synchronizing bouncer duration with page scaling duration.
 2012-11-08 15:46:36 -08:00
Daniel Sandler
b57693d7c4 am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit 'e7689b82fa8a544289e7bcbb33ac6b33da6c9648':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 15:46:32 -08:00
Amith Yamasani
dddcd61d3f am fda5c852: am 318d87fb: am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit 'fda5c8524d5d8971c392748a3d06a815e46276d3':
 2012-11-08 15:46:28 -08:00
Adam Powell
805f386d51 am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
  Fiddle with keyguard glowpad layouts
 2012-11-08 15:46:25 -08:00
Winson Chung
60873ddec1 am 8c5ebad0: am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot. 
* commit '8c5ebad0033de401130d2367ec40d826691542ee':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
 2012-11-08 15:46:21 -08:00
Jim Miller
87d6e4be88 am 426348ae: am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev 
* commit '426348ae8158f84c034310e08602362bd1a02072':
  Don't handle click events on the emergency button in bouncer mode
 2012-11-08 15:46:18 -08:00
Daniel Sandler
5a65073e5c am e8d02b31: am 1323fe3e: am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev 
* commit 'e8d02b315b4b8f76e53edb194591b6b46175ffe4':
  New asset for assist affordance on lockscreen.
 2012-11-08 15:46:14 -08:00
Adam Powell
10bd6403b5 am b4c8cf6a: am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev 
* commit 'b4c8cf6ac473c33d946043b2e4cc9f7ba91dd8ce':
  Use stable layouts for keyguard/SlidingChallengeLayout
 2012-11-08 15:46:11 -08:00
Jim Miller
23b94022ba am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3a191b495c886a654f33fe717467a74975137e58':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 15:46:07 -08:00
Daniel Sandler
ebb0b118f1 am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev 
* commit '98a53594aebc86491641b44649d0178a7bec0d79':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
 2012-11-08 15:46:03 -08:00
Winson Chung
1540a21f3d am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
  Fixing up overscroll asset / sizing
 2012-11-08 15:45:55 -08:00
Jim Miller
2a72038ae2 am e7bb1f69: am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev 
* commit 'e7bb1f690e3e9d6406dd27390ec35a0a81922541':
  Add one more check for detecting crashes while inflating multiuser widget
 2012-11-08 15:45:51 -08:00
Svetoslav Ganov
09b6f4bbff am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '8fa69381f212b85ec9156e0a95382cd3ff312444':
  Slide unlock cannot get accessibility focus.
 2012-11-08 15:45:48 -08:00
Jim Miller
0927eb2112 am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
  Implement fallback clock in keyguard
 2012-11-08 15:45:43 -08:00
Michael Jurka
27ecdf8e33 am b40f9408: am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev 
* commit 'b40f9408f59b06f75ffc7fbdcc6d833183d77d18':
  Fix bug where newly added widget wasn't always shown
 2012-11-08 15:45:39 -08:00
Adam Cohen
92f828f2a4 am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 15:45:35 -08:00
Adam Powell
605ada850a am d921f604: am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev 
* commit 'd921f604409f5715dd65d59af81274b2614c2476':
  Fix keyguard measurement bugs
 2012-11-08 15:45:31 -08:00
Eric Laurent
91d5cc56d3 am 2b988843: am 30717b68: Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev 
* commit '2b9888439d4016ac4890b0c6018d2f5a9e5bd653':
  AudioService: undock audio glitch - DO NOT MERGE
 2012-11-08 15:45:27 -08:00
Eric Laurent
8a8e2a4b9c am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev 
* commit '98e5c81438f36d907215eeba338ee834c29791de':
  audio service fix dock after crash - DO NOT MERGE
 2012-11-08 15:45:23 -08:00
The Android Open Source Project
122dbe96d8 am cc16a7ef: am 75993947: Reconcile with jb-mr1-release - do not merge 
* commit 'cc16a7efaa5346fb3876ed729bbd4d954c18df2e':
 2012-11-08 15:45:07 -08:00
Amith Yamasani
807dc6f038 am 081c36de: am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '081c36ded6a562ae2bde4238592a1e7bc13ba151':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 15:44:40 -08:00
Satoshi Kataoka
ae41ba1563 am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit '4424951fa566b3bf6e57b08f615facc680059164':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-08 15:44:26 -08:00
Sascha Prueter
45d0a78be7 am ef378ae2: am 14c89330: am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit 'ef378ae2047e3095fbf135c07b8f470f7e07cb54':
 2012-11-08 15:44:21 -08:00
Victoria Lease
29be45f53f am 5def8930: am d9da50ba: am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '5def893095e9e14cf79d1ac18345f578592f98cd':
 2012-11-08 15:44:17 -08:00
Chris Wren
9ede3fd568 am 483483f8: am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '483483f85ecc193457b8c68c28e502f43389ec13':
  add logging to enableUserSelectorIfNecessary.
 2012-11-08 15:44:13 -08:00
Chris Wren
eac1e897bb am 29cc9489: am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '29cc94898ff6e851ddd22d53e12f96524d9074a9':
  add some defensive code to enableUserSelectorIfNecessary.
 2012-11-08 15:44:09 -08:00
Daniel Sandler
566e78d9f7 am 5e6944bc: am e4e6c97e: am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '5e6944bc000c85160b19a0f96631165fd4a32b3f':
 2012-11-08 15:44:06 -08:00
Baligh Uddin
84037a76e9 am 24ee3595: am 70869876: am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '24ee3595dc481a9b45d92afebd9142e980a7da60':
 2012-11-08 15:44:02 -08:00
Baligh Uddin
7a08dc970b am eeb747c5: am d9550886: am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'eeb747c559f3dc8c7815e6ba25d600c204b40d10':
  Import translations. DO NOT MERGE
 2012-11-08 15:43:59 -08:00