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

79133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
c5c3a41f08 am dfcdde79: am 1dee8974: Merge "Track animating apps up until animation starts." into jb-dev 
* commit 'dfcdde790299ade3417a89cf8ff1aa9f3c46e5a3':
  Track animating apps up until animation starts.
 2012-05-29 11:52:35 -07:00
Craig Mautner
dfcdde7902 am 1dee8974: Merge "Track animating apps up until animation starts." into jb-dev 
* commit '1dee8974693fff55e276e0aed1202e43904bb944':
  Track animating apps up until animation starts.
 2012-05-29 11:48:45 -07:00
Craig Mautner
1dee897469 Merge "Track animating apps up until animation starts." into jb-dev 2012-05-29 11:45:16 -07:00
Amith Yamasani
6dee475c73 am bd817711: am 3dac0226: Merge "Show power menu on tablets." into jb-dev 
* commit 'bd817711d74d04d5640bebfd8c85aa42285f091c':
  Show power menu on tablets.
 2012-05-29 11:30:23 -07:00
Amith Yamasani
bd817711d7 am 3dac0226: Merge "Show power menu on tablets." into jb-dev 
* commit '3dac02265e42bf176e26b83da430ce15d6fd06df':
  Show power menu on tablets.
 2012-05-29 11:26:16 -07:00
Amith Yamasani
3dac02265e Merge "Show power menu on tablets." into jb-dev 2012-05-29 11:22:32 -07:00
Ben Murdoch
406683151d Merge "Deprecate WebChromeClient.onJsTimeout" 2012-05-29 11:18:34 -07:00
Craig Mautner
06a94f710d Track animating apps up until animation starts. 
ActivityStack sets the mNextAppTransition value before moving the apps
to their proper position. This makes the test for mNextAppTransition
being TRANSITION_UNSET incorrect. Better to just look for animating.

Fixes bug 6565418.

Change-Id: I4651b7d3678e46fc712a8e901992fb01b94c415e
 2012-05-29 10:46:00 -07:00
The Android Open Source Project
4478790b17 am 42e55e64: Reconcile with jb-release nakasi-factoryrom-release 
* commit '42e55e64c1045e01486531c354d6e4a4dd2a57d8':
  Fix bad aspect ratios for recorded effects
 2012-05-29 09:45:17 -07:00
The Android Open Source Project
42e55e64c1 Reconcile with jb-release nakasi-factoryrom-release 
Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
 2012-05-29 09:39:33 -07:00
The Android Automerger
b1aed8429e merge in jb-release history after reset to jb-dev 2012-05-29 08:58:07 -07:00
Michael Jurka
0ee33e46a7 am fc9c4434: am 48c22c84: Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev 
* commit 'fc9c4434da6f20c104964d7d20f3571e07abbf9a':
  Adding debugging code for bug where recycled views still had parent
 2012-05-29 08:48:38 -07:00
Michael Jurka
fc9c4434da am 48c22c84: Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev 
* commit '48c22c84c089213dda6495fbdeb384e400c7c5c5':
  Adding debugging code for bug where recycled views still had parent
 2012-05-29 08:44:31 -07:00
Michael Jurka
48c22c84c0 Merge "Adding debugging code for bug where recycled views still had parent" into jb-dev 2012-05-29 08:41:49 -07:00
Danielle Millett
8f6411888d am d9650191: am 45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev 
* commit 'd965019105a4a6bb4c924fe063b4c69c4b8020a6':
  Moved setting the flag to suppress face unlock during a phone call
 2012-05-29 06:30:41 -07:00
Danielle Millett
d965019105 am 45973d6d: Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev 
* commit '45973d6d19eb9329d77e62004e80f63f111a27e5':
  Moved setting the flag to suppress face unlock during a phone call
 2012-05-29 06:27:14 -07:00
Danielle Millett
45973d6d19 Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev 2012-05-29 06:24:05 -07:00
Michael Jurka
b2a5d9e546 Adding debugging code for bug where recycled views still had parent 
Bug: 6499508
Change-Id: Iaf95ee6a0836c5f1e863d6a5b969e032d36a2b27
 2012-05-29 03:44:18 -07:00
Ben Murdoch
1bd37b176e Deprecate WebChromeClient.onJsTimeout 
This method was only supported with the JSC JavaScript engine.
V8 became the default JavaScript engine in Froyo and this method
has not been invoked since. Support for building JSC was removed
in b/5495373.

Bug: 6295376
Change-Id: I3dbe83f375b88ebbbb713d3c3fa5a2fa323a0d45
 2012-05-28 14:20:07 +01:00
Steve Block
47faa92c62 Merge "Avoid unintended side-effects of loading javascript: URLS in Java Bridge tests" 2012-05-28 03:29:22 -07:00
Bryan Mawhinney
fc11edb05a am 592a3f54: am c3a5cf9a: Actually set the video scaling mode :-) 
* commit '592a3f544745f19d9901692700a1b439b9f8c57b':
  Actually set the video scaling mode :-)
 2012-05-27 12:53:48 -07:00
Bryan Mawhinney
592a3f5447 am c3a5cf9a: Actually set the video scaling mode :-) 
* commit 'c3a5cf9aab3d409445accb2a93c09e6b4140d196':
  Actually set the video scaling mode :-)
 2012-05-27 12:50:40 -07:00
Bryan Mawhinney
c3a5cf9aab Actually set the video scaling mode :-) 
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
 2012-05-27 17:42:46 +01:00
Romain Guy
44660e6d07 am 59893daa: am bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 
* commit '59893daa5002f1c6dd10b97f5ee6645550554179':
  Tale of status bar on crespo, part 3 Bug #6541079
 2012-05-25 19:28:00 -07:00
Romain Guy
59893daa50 am bbedfa00: Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 
* commit 'bbedfa0036f8de393c05b2ad981695ae74e7ab42':
  Tale of status bar on crespo, part 3 Bug #6541079
 2012-05-25 19:23:48 -07:00
Romain Guy
bbedfa0036 Merge "Tale of status bar on crespo, part 3 Bug #6541079" into jb-dev 2012-05-25 19:21:49 -07:00
Jeff Brown
401950e3d4 am 9026fecd: am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev 
* commit '9026fecd517020d70d62379c49e749d25a65a9cb':
  Don't ANR on hover, scroll or if a window goes away.
 2012-05-25 18:44:54 -07:00
Jeff Brown
9026fecd51 am d4cf7e7b: Merge "Don\'t ANR on hover, scroll or if a window goes away." into jb-dev 
* commit 'd4cf7e7b06e6870d447dbed2683b8849cfe5336b':
  Don't ANR on hover, scroll or if a window goes away.
 2012-05-25 18:41:20 -07:00
Jeff Brown
d4cf7e7b06 Merge "Don't ANR on hover, scroll or if a window goes away." into jb-dev 2012-05-25 18:38:24 -07:00
Chet Haase
5f9853738a am 9d8933ec: am a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev 
* commit '9d8933ec11416147af2d2c36ba0dfa5e806b851a':
  Make Google search panel go away when receiving phone call
 2012-05-25 15:56:52 -07:00
John Reck
83a40e8e64 am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
  Copy over the scroll position for the scrolling layer
 2012-05-25 15:56:48 -07:00
Chet Haase
9d8933ec11 am a27551dd: Merge "Make Google search panel go away when receiving phone call" into jb-dev 
* commit 'a27551dde853733e89aa16b6fb096186b08c5d81':
  Make Google search panel go away when receiving phone call
 2012-05-25 15:52:01 -07:00
John Reck
2611f1eced am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 
* commit '7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
  Copy over the scroll position for the scrolling layer
 2012-05-25 15:51:58 -07:00
Chet Haase
a27551dde8 Merge "Make Google search panel go away when receiving phone call" into jb-dev 2012-05-25 15:49:47 -07:00
John Reck
7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev 2012-05-25 15:49:15 -07:00
Irfan Sheriff
f7fbb801c9 am 7d16bf40: am e2417b7a: Merge "Retain device during connecting state" into jb-dev 
* commit '7d16bf4085a2e5dce68f7a08a08ad91b4480d9d7':
  Retain device during connecting state
 2012-05-25 15:19:23 -07:00
Amith Yamasani
7ee994d728 Show power menu on tablets. 
Bug: 6524432

Show power menu on all devices by default. Specific devices will be disabled in overlays.

Handle airplane mode changes differently when the telephony states are not reliable.
Use simple toggle for silent mode when there's no vibrator.

Change-Id: Ic5ef521eee19cd300d909250203ff204f3a1ae1e
 2012-05-25 15:18:21 -07:00
Irfan Sheriff
7d16bf4085 am e2417b7a: Merge "Retain device during connecting state" into jb-dev 
* commit 'e2417b7a6ef2ba539be70574fe7c9e1af4810dd4':
  Retain device during connecting state
 2012-05-25 15:15:32 -07:00
Irfan Sheriff
e2417b7a6e Merge "Retain device during connecting state" into jb-dev 2012-05-25 15:13:27 -07:00
Brandon Keely
465fc7185f am c3750d06: am 3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 
* commit 'c3750d068c0414766b46df4706b93ffced45b922':
  For 720dp devices, less motion during task-to-task transition.
 2012-05-25 14:46:03 -07:00
Brandon Keely
c3750d068c am 3ef8dd2b: Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 
* commit '3ef8dd2b399109c2c9b05ea24315bcc2e0ba8df2':
  For 720dp devices, less motion during task-to-task transition.
 2012-05-25 14:41:52 -07:00
Brandon Keely
3ef8dd2b39 Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev 2012-05-25 14:38:47 -07:00
Eric Fischer
e63bf1d445 am edabf9c7: (-s ours) am dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'edabf9c75eb56c46d242d4c799723e0851dc2976':
  Import translations. DO NOT MERGE
 2012-05-25 14:32:15 -07:00
Eric Fischer
edabf9c75e am dfaadf9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'dfaadf9dae65e4e3cee7430908c98614bb208d20':
  Import translations. DO NOT MERGE
 2012-05-25 14:28:07 -07:00
Eric Fischer
0e34493745 Merge "Import translations. DO NOT MERGE" 2012-05-25 14:26:59 -07:00
Eric Fischer
dfaadf9dae Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:24:44 -07:00
Eric Fischer
282538c7fd am 085e8796: (-s ours) am aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '085e879629a2ba1c37cfcff75205501c562287e1':
  Import translations. DO NOT MERGE
 2012-05-25 14:22:39 -07:00
Eric Fischer
085e879629 am aed9b810: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'aed9b810a538fa02cc5f104e29841c90977ebeaa':
  Import translations. DO NOT MERGE
 2012-05-25 14:18:47 -07:00
Eric Fischer
bc50b3858c Merge "Import translations. DO NOT MERGE" 2012-05-25 14:18:45 -07:00
Eric Fischer
2001858fc8 Merge "Import translations. DO NOT MERGE" 2012-05-25 14:15:10 -07:00