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

95848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
16ccfa2309 am 0927eb21: am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit '0927eb21125dd9438159b22ffff27c8fdbcbfedb':
  Implement fallback clock in keyguard
 2012-11-08 15:56:31 -08:00
Michael Jurka
cb4d64562b am 27ecdf8e: am b40f9408: am 090c790c: am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev 
* commit '27ecdf8e337df816fe546b5e63632fb83df1bfa8':
  Fix bug where newly added widget wasn't always shown
 2012-11-08 15:56:27 -08:00
Adam Cohen
7a81cffa9b am 92f828f2: am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '92f828f2a4f873871ddd4b6f81812f94cc0bd227':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 15:56:23 -08:00
Adam Powell
fb1f00de2d am 605ada85: am d921f604: am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev 
* commit '605ada850a44cc9ca28c3358b5db304e03f27969':
  Fix keyguard measurement bugs
 2012-11-08 15:56:19 -08:00
Eric Laurent
68caeb27fe am 91d5cc56: (-s ours) am 2b988843: am 30717b68: Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev 
* commit '91d5cc56d388adf74e276bc0433ca8d753d0815c':
  AudioService: undock audio glitch - DO NOT MERGE
 2012-11-08 15:56:15 -08:00
Eric Laurent
1672e7ef4f am 8a8e2a4b: (-s ours) am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev 
* commit '8a8e2a4b9c7ed373e7cc94befd60de90de587e19':
  audio service fix dock after crash - DO NOT MERGE
 2012-11-08 15:56:11 -08:00
The Android Open Source Project
0f0f2d8ab4 am 122dbe96: (-s ours) am cc16a7ef: am 75993947: Reconcile with jb-mr1-release - do not merge 
* commit '122dbe96d89e8d5439cf41b92ac8b0ec435f331e':
 2012-11-08 15:56:07 -08:00
Amith Yamasani
d6a6c7f25f am 807dc6f0: 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 '807dc6f038b906ca52741a5768020110be53a779':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 15:56:03 -08:00
Satoshi Kataoka
350d4cbec1 am ae41ba15: 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 'ae41ba156364f5625280c4229169899adea965d5':
  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:55:59 -08:00
Sascha Prueter
d088145839 am 45d0a78b: am ef378ae2: am 14c89330: am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '45d0a78be79ab9e26f759c0874e6eaf70f5e119b':
 2012-11-08 15:55:52 -08:00
Victoria Lease
626d92158f am 29be45f5: am 5def8930: am d9da50ba: am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '29be45f53faa3223406bc15db597367d73a8485d':
 2012-11-08 15:55:48 -08:00
Chris Wren
aa45e2ebbc am 9ede3fd5: am 483483f8: am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '9ede3fd568ce22eee149b76eefeb20fe23770fe6':
  add logging to enableUserSelectorIfNecessary.
 2012-11-08 15:55:44 -08:00
Chris Wren
eb7c28c4b0 am eac1e897: am 29cc9489: am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit 'eac1e897bb939d6ce7cb987754939eb734e2cc24':
  add some defensive code to enableUserSelectorIfNecessary.
 2012-11-08 15:55:40 -08:00
Daniel Sandler
88816e5c4f am 566e78d9: am 5e6944bc: am e4e6c97e: am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '566e78d9f7d2451d964b06a1a9842e72204e6689':
 2012-11-08 15:55:37 -08:00
Baligh Uddin
5621a40015 am 84037a76: (-s ours) am 24ee3595: am 70869876: am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '84037a76e9ec5134da6ffd104b35be9c2dba7fae':
 2012-11-08 15:55:33 -08:00
Baligh Uddin
050b2d030c am 7a08dc97: (-s ours) am eeb747c5: am d9550886: am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '7a08dc970b4deb57a9dcc655825490ea17b897b1':
  Import translations. DO NOT MERGE
 2012-11-08 15:55:28 -08:00
Adam Cohen
f131782479 am 6da1fdd1: am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 
* commit '6da1fdd101334ff00090c73143b5bd97b2c93f34':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
 2012-11-08 15:55:24 -08:00
Baligh Uddin
d65b1c340b am 13fb25b0: (-s ours) am 5c89a592: am 4d0e5e0e: am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '13fb25b0d2c58073f032cd5854e17a3bd40ef5e0':
 2012-11-08 15:55:18 -08:00
Justin Koh
9d0640cfb6 am 3e94c562: am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 
* commit '3e94c56215fa540ca722ab7b23710b82c08d20a4':
  Catch exception of nonfound activities
 2012-11-08 15:55:14 -08:00
Irfan Sheriff
b0b963b261 am c03b5164: am 5c8e5585: am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev 
* commit 'c03b51641cb73594cf64bdd25356590dff0e796c':
  Re-use existing thread
 2012-11-08 15:55:07 -08:00
Sascha Prueter
708c9c6b47 am d95ee5f7: am 61026ab1: am eb3aa44c: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit 'd95ee5f7531846638a81a3f40c5fd863a81fcb03':
  Final icon for notifications panel
 2012-11-08 15:55:02 -08:00
Victoria Lease
d760606427 am 63fd43ba: am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '63fd43ba50943940ae248c499f97e6d8c1903c5f':
  disable geofences for secondary users
 2012-11-08 15:54:56 -08:00
Daniel Sandler
facda3d1c5 am 7f83ef61: am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '7f83ef619a3ad067c0b010c2f8bb113abf53b6c0':
  Fix docs to refer to the correct class.
 2012-11-08 15:54:51 -08:00
Baligh Uddin
3ad5f0aeff am 041f633c: (-s ours) am 6ee0c2b8: am 0d29833f: am 32226b73: Import translations. DO NOT MERGE 
* commit '041f633c56f2a5e85aa91b82f34159061609dccf':
  Import translations. DO NOT MERGE
 2012-11-08 15:54:46 -08:00
Baligh Uddin
37d969d7a6 am 7aa9e324: (-s ours) am eaa70d72: am b97aadec: am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7aa9e32457bd4d26232c9912690a6601b3e66810':
  Import translations. DO NOT MERGE
 2012-11-08 15:54:34 -08:00
The Android Open Source Project
ab999ce345 am 87aa1a24: (-s ours) am bc287eb8: am 63985103: Reconcile with jb-mr1-release - do not merge 
* commit '87aa1a24bf62f1d49a4830a71a3fe8dea16fc361':
 2012-11-08 15:52:19 -08:00
John Spurlock
1eb90d90e5 am f220f117: am 5d561365: am 66453ff5: am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 
* commit 'f220f1176629e836928d00ce3309587fb42c0b10':
  Low battery dialog should use UserHandle.CURRENT.
 2012-11-08 15:52:15 -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