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

95889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
d5759ecf1f am a49ab4f8: am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'a49ab4f8f17d9c222275c6196220838528629c66':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 18:08:53 -08:00
The Android Automerger
913f13ef69 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-08 17:53:27 -08:00
Glenn Kasten
068225de01 Add all-channel setVolume() API 
Add combined channel APIs setVolume to AudioTrack, MediaPlayer, and
SoundPool to make later migration easier, and encourage apps to use
that API.  The new APIs are @hide for now.

Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
 2012-11-08 17:50:43 -08:00
Adam Cohen
ecba011fd8 am c1ae43ad: am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev 
* commit 'c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
 2012-11-08 16:41:31 -08:00
Adam Cohen
a49ab4f8f1 am b82b3b57: am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev 
* commit 'b82b3b5754305c36cfeb7c87816110da3c7b2ff4':
  Deferring size callbacks until boot completed (issue 7469267)
 2012-11-08 16:41:27 -08:00
Andy McFadden
325be8a1ea Reduce emulator logspam 
The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
 2012-11-08 16:40:21 -08:00
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
e3c4001cdb am 167296d7: (-s ours) am 5c0da20c: am 71a408b9: Reconcile with jb-mr1-release - do not merge 
* commit '167296d70a022fc65a4e9fda10f3bd13e1d4b428':
 2012-11-08 15:58:56 -08:00
Dianne Hackborn
55fdd58af8 am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev 
* commit 'e0d454d2e86f4170bdab68d45696fb2eb9a87f9f':
  Remove extraneous logs.
 2012-11-08 15:58:52 -08:00
Daniel Sandler
0e4d6de103 am 77f2e27e: am 9b15f2e5: am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev 
* commit '77f2e27e68a851b5cec13e724645972df663d397':
  Don't crash if no ECA.
 2012-11-08 15:58:48 -08:00
Chris Wren
b063e7b634 am b3e8071d: am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 
* commit 'b3e8071d8198096fe1bb19183c5ba3d342a11fe9':
  allow pattern linear layout to manage message_area.
 2012-11-08 15:58:44 -08:00
Daniel Sandler
11bf8e2c14 am 8d62faea: am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 
* commit '8d62faea22e8974d72cd98dd7cd3f919504d7123':
  Only show the bouncer for the assistant if secure.
 2012-11-08 15:58:37 -08:00
John Spurlock
17dcc0156c am 2a1e6a69: am 18048411: am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..." 
* commit '2a1e6a69a7713d588769693df96a7b8f2a6438c3':
  Address comments from merged "Fix remaining jank in sec..."
 2012-11-08 15:58:32 -08:00
John Spurlock
4dd1cec48d am b99a6b33: am cc60b7dc: am baee9ed5: am 7a73344b: Minimal fix for stuck google now. 
* commit 'b99a6b336de0e9a2a8ff89276137af20321dfc2a':
  Minimal fix for stuck google now.
 2012-11-08 15:58:25 -08:00
Jim Miller
abc9bba610 am fe3d459d: 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 'fe3d459d9ce9b1b945b78312e7324c4b7b88688d':
  Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
 2012-11-08 15:58:19 -08:00
Michael Jurka
76f117da7e am 9d31d103: am 1470297c: am 47674796: am eb963f04: Enforce max number of 5 lockscreen widgets 
* commit '9d31d103b374e3327de13fdb954d400bd0abc628':
  Enforce max number of 5 lockscreen widgets
 2012-11-08 15:58:15 -08:00
Adam Cohen
db5790d6e1 am 5d92a50e: am 06b29549: am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 
* commit '5d92a50efd069a3056fdf94d2673f3934378d213':
  Adding user activity when the challenge is slid down
 2012-11-08 15:58:11 -08:00
Jim Miller
d772ff8287 am b67cba33: am 2b49dd1c: am 6c7d2c24: am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 
* commit 'b67cba335580b3c410bfd41a922c07c07bcff97a':
  Don't show ECA in landscape mode on phones.
 2012-11-08 15:58:07 -08:00
Jim Miller
08bb2316f1 am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 15:58:03 -08:00
Adam Powell
34920823fc am 70eeec5c: am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '70eeec5c06db3bf38e94d95a284d393e79bf87a0':
  add bouncer frame to glowpad.
 2012-11-08 15:57:58 -08:00
Adam Powell
44dd9b63c2 am 2f63c24e: am d7aaf3af: am f3eaabb9: am a9fa92e8: Keyguard - force showing the status bar 
* commit '2f63c24e72a739fb143dd7d17a6964a2857244c5':
  Keyguard - force showing the status bar
 2012-11-08 15:57:54 -08:00
Jim Miller
8f520143e6 am 8b26141a: am 670f5a52: am e0dd7c46: am 2cacda5f: Disable interactive mode for full-screen security views in keyguard. 
* commit '8b26141a6cd7125978d52576a9c2c9d29a564837':
  Disable interactive mode for full-screen security views in keyguard.
 2012-11-08 15:57:49 -08:00
Adam Cohen
23d5a1d715 am ee9bb25a: am 230719c7: am 640cf0ab: am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev 
* commit 'ee9bb25a3a191d2808425d0635f2f3e36a8253dc':
  Clean up some flashy jank (issue 7454766)
 2012-11-08 15:57:45 -08:00
Winson Chung
d2dd5d9fa1 am 462222fc: am 10bcc7d9: am 18825966: am 70c2f873: Synchronizing bouncer duration with page scaling duration. 
* commit '462222fc5da2818a7ca7171eea4dbda7373ac99e':
  Synchronizing bouncer duration with page scaling duration.
 2012-11-08 15:57:41 -08:00
Daniel Sandler
87942cf46f am b57693d7: am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit 'b57693d7c45e56ef9bff516f0b92dfdc7daa94b3':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 15:57:36 -08:00
Amith Yamasani
897335ed0f am dddcd61d: 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 'dddcd61d3fdac9955e30e0302d9e4dbc1ebd9c13':
 2012-11-08 15:57:32 -08:00
Adam Powell
8d53e1bfcb am 805f386d: am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit '805f386d518b2c810cbb37f67f8eb4f42157e229':
  Fiddle with keyguard glowpad layouts
 2012-11-08 15:57:28 -08:00
Winson Chung
77f740c1f1 am 60873dde: am 8c5ebad0: am 062e01c5: am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot. 
* commit '60873ddec1901ae335fd018d7ee53055ba66aeaf':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
 2012-11-08 15:57:24 -08:00
Jim Miller
dba631e43b am 87d6e4be: 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 '87d6e4be882a570144d98e43c4487e7900dbb839':
  Don't handle click events on the emergency button in bouncer mode
 2012-11-08 15:57:20 -08:00
Daniel Sandler
e85f7bb133 am 5a65073e: am e8d02b31: am 1323fe3e: am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev 
* commit '5a65073e5cb0f2955817fa6cfeaf2514eb8c7813':
  New asset for assist affordance on lockscreen.
 2012-11-08 15:57:16 -08:00
Adam Powell
5edb1fdd52 am 10bd6403: am b4c8cf6a: am 75298e33: am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev 
* commit '10bd6403b567b10db4bf2fed9082f4eab31457b0':
  Use stable layouts for keyguard/SlidingChallengeLayout
 2012-11-08 15:57:08 -08:00
Jim Miller
f93d1e405a am 23b94022: am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '23b94022ba4cdd0b45c2c2835d45921423d916c8':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 15:57:03 -08:00
Daniel Sandler
4ea613235a am ebb0b118: am 98a53594: am 0e767b29: am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev 
* commit 'ebb0b118f18b97e18bb69c0fe12f252adcf2557c':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
 2012-11-08 15:56:58 -08:00
Winson Chung
6044249b6b am 1540a21f: 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 '1540a21f3d8fb5c1fcd7f1fcc8f4e63d644c27d1':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 15:56:54 -08:00
Adam Cohen
82f9474ed3 am bd8c736b: am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit 'bd8c736bfdef9072d55058cdc8ca4b661336778c':
  Fixing up overscroll asset / sizing
 2012-11-08 15:56:46 -08:00
Jim Miller
3abe50956c am 2a72038a: am e7bb1f69: am 4bd4b78f: am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev 
* commit '2a72038ae26274776b01b508cae1d6477a4abce5':
  Add one more check for detecting crashes while inflating multiuser widget
 2012-11-08 15:56:39 -08:00
Svetoslav Ganov
7d90437bb8 am 09b6f4bb: am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '09b6f4bbff67f210aa135d0158985cb3c47f95a4':
  Slide unlock cannot get accessibility focus.
 2012-11-08 15:56:35 -08:00
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