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

51839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
df0d966d67 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Narayan Kamath
4b1b27a798 Merge "Language loading / availablity should repsect defaults enforcement." 2011-06-03 04:34:45 -07:00
Mathias Agopian
b2450ce105 Merge "use quaternions instead of MRPs" 2011-06-02 21:13:13 -07:00
Mathias Agopian
6043e5329c use quaternions instead of MRPs 
also use correct time propagation equation
disable the fused sensors when gyro is not present since
they were unusable in practice.

Change-Id: Iad797425784e67dc6c5690e97c71c583418cc5b5
 2011-06-02 21:11:50 -07:00
satok
b1b2e2275f Merge "Update internal states stored in InputMethodManager properly" 2011-06-02 20:59:14 -07:00
Tadashi G. Takaoka
7e7248f2df am 6d1b8995: (-s ours) am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE) 
* commit '6d1b8995a6e10a3107fd585fc4bae8b2dde24196':
  Fix input type judgment of WebTextView (DO NOT MERGE)
 2011-06-02 19:07:20 -07:00
Conley Owens
e30277b091 am 1bbcc695: am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 
* commit '1bbcc6953ae692206052e62b6adae15e221ec356':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
 2011-06-02 18:53:25 -07:00
Xavier Ducrohet
0b423bd591 am 59e699f1: (-s ours) am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. 
* commit '59e699f13db9a32f30108e25577685bb39b3dae4':
  Merge 6103e22c from honeycomb-mr1. do not merge.
 2011-06-02 18:53:17 -07:00
Xavier Ducrohet
e73e77e5eb am 311f9493: (-s ours) am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. 
* commit '311f9493dfa88d455ff0ea25f86e508a6852682d':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
 2011-06-02 18:53:03 -07:00
Ed Heyl
31e61185a6 resolved conflicts for merge of 39ddeae0 to master 
Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
 2011-06-02 18:49:11 -07:00
Jeff Brown
60a126a4c8 Merge "Fix ABS_MT_SLOT handling." 2011-06-02 18:31:47 -07:00
Jeff Brown
441a9c28f5 Fix ABS_MT_SLOT handling. 
Shouldn't reset the current slot index to 0 after each SYN_REPORT.

Change-Id: I370e4770f8ae0ce598369ecbaf64772c13e02d46
 2011-06-02 18:29:10 -07:00
satok
501017eb8f Merge "resolved conflicts for merge of 7e2181c0 to master" 2011-06-02 18:28:58 -07:00
satok
3fc1f85a37 resolved conflicts for merge of 7e2181c0 to master 
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
 2011-06-03 10:26:15 +09:00
Jim Miller
0d780ae8ac Merge "Fix 4518876: Disable lock screen rotation on phones." 2011-06-02 18:22:54 -07:00
Jim Miller
06cc78a4e3 Fix 4518876: Disable lock screen rotation on phones. 
This reverts commit e28016c28620f070a6737c7fd536437e7b116f84
that enabled lockscreen rotation always and works around a
race condition caused by KeyguardViewManager not following
onConfigurationChanged events.  It now checks
R.bool.config_enableLockScreenRotation each time it is shown.

There's still some work to be done, but this change makes the
phone usable.  KeyguardViewManager needs to track config
changes and update the layout parameters to be correct.

Change-Id: I7c9f2402c960d5bd72a4b73118a66e27a05777cf
 2011-06-02 18:19:03 -07:00
Dianne Hackborn
507fc54924 Merge "Whoops forgot this." 2011-06-02 17:05:45 -07:00
Dianne Hackborn
3c4ce77c63 Whoops forgot this. 
Change-Id: I636cda270cdabcb0b4e0465739a8ee0e08cac56f
 2011-06-02 17:04:45 -07:00
Brian Carlstrom
eefaf27d55 Merge "KeyStore.reset changes" 2011-06-02 17:02:38 -07:00
Daniel Lehmann
fb771d1ecc Merge "Remove the obsolete function that is not used anymore" 2011-06-02 16:59:10 -07:00
Kazuhiro Ondo
7ec9ab88d7 am a36c8f69: am 57675037: Further fix for SIM detection. 
* commit 'a36c8f693d935d75657271d89f57884f5df1a92d':
  Further fix for SIM detection.
 2011-06-02 16:51:45 -07:00
Dianne Hackborn
9313a27797 am 096762d6: am 8075fe48: am 78470718: Fix various places that were using the wrong display metrics. 
* commit '096762d6efcae6300c02919bc6b3eaeeffccf91d':
  Fix various places that were using the wrong display metrics.
 2011-06-02 16:50:59 -07:00
Dianne Hackborn
7dad2c24fa am 9b94aa18: am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps. 
* commit '9b94aa18f78e6c6281202e72b5a7451bc479fe82':
  Fix compat mode bugs when updating apps.
 2011-06-02 16:50:13 -07:00
Dianne Hackborn
63b18d395c Merge "resolved conflicts for merge of 54cb63e2 to master" 2011-06-02 16:46:05 -07:00
Dianne Hackborn
8a7d44e824 resolved conflicts for merge of 54cb63e2 to master 
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
 2011-06-02 16:44:52 -07:00
Fabrice Di Meglio
09b867ec07 Merge "Update BiDiTest app" 2011-06-02 16:37:32 -07:00
Fabrice Di Meglio
2f9cad27fd Update BiDiTest app 
- change buttons text to follow their Gravity

Change-Id: Ie0d79ced9c14bf8b0f12d1c31da5e2fe6f162c88
 2011-06-02 16:35:21 -07:00
Brian Carlstrom
e2afc2420d KeyStore.reset changes 
restore keystore reset behavior of removing master key.
otherwise after reboot keystore has is LOCKED and not UNINITIALIZED
	cmds/keystore/keystore.cpp

when removing password, reset the keystore, so it doesn't remain
locked with a now bogus password.

	core/java/com/android/internal/widget/LockPatternUtils.java

Change-Id: If5e0bb50b42599e9ca27a8b91d6cec12528419a1
 2011-06-02 16:24:45 -07:00
Dianne Hackborn
0e5e16a656 am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 
* commit 'da9837fb61c8aa53c67921682016d97655332089':
  Small fixes and cleanup of resource config handling.
 2011-06-02 16:24:12 -07:00
James Dong
2170a992da am ef9be207: (-s ours) am 6c2db6fb: am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2 
* commit 'ef9be207152d54cbc1382121053e25414b3b2ed3':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
 2011-06-02 16:23:34 -07:00
Tadashi G. Takaoka
f3460b4106 am ccb2bc6c: (-s ours) am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2 
* commit 'ccb2bc6c155c09e88e4fbbbd30382ae58c087ce5':
  Fix InputType determination of WebTextView (DO NOT MERGE)
 2011-06-02 16:23:07 -07:00
Scott Main
b4ac9e5ad6 am 092b0bd9: am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2 
* commit '092b0bd9b62e3b0fe07dfd4c5a0b3323ff95d2a0':
  docs: adjust what's visible for online and offline docs
 2011-06-02 16:22:39 -07:00
Wink Saville
2d6ebd559c am 205a2c3a: am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE 
* commit '205a2c3a3e6f50039bf296ad0af22f9a93f7eaf9':
  DataConnection FailCause should use errorCode rather than ordinal.
 2011-06-02 16:22:23 -07:00
Fabrice Di Meglio
a1908aa05c Merge "Improve ViewDebug informations for View and LineaLayout" 2011-06-02 16:15:01 -07:00
Brett Chabot
d5f89ebefe Merge "Test runner cleanup: delete unused old classes." 2011-06-02 16:01:46 -07:00
Fabrice Di Meglio
bce84d2bca Improve ViewDebug informations for View and LineaLayout 
Change-Id: Ie34519c975027dead806b7859b638d78c39ace77
 2011-06-02 15:57:01 -07:00
Wink Saville
8806be91fd am 08c00205: am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE 
* commit '08c00205a7df0c9af94e4869b800be05eb38c660':
  DataConnection : Have a separate alarm for each APN type.
 2011-06-02 15:08:29 -07:00
Wink Saville
ce7aa22515 am 37a4069f: am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE 
* commit '37a4069ff957ee64caba52b3f9f5d4ac70f4ea7b':
  Derive ICC status from multiple application status for UICC
 2011-06-02 15:08:13 -07:00
Dianne Hackborn
98c6870e0e Merge "resolved conflicts for merge of 5c2e4d20 to master" 2011-06-02 15:04:36 -07:00
Romain Guy
4b2711372d Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG." 2011-06-02 14:49:28 -07:00
Shimeng (Simon) Wang
f32d43b294 Merge "Make sure scale will not go beyond overview scale after rotation." 2011-06-02 14:41:58 -07:00
Romain Guy
6f7d9394ec Take advantage of EGL_BUFFER_PRESERVED on IMG. 
The IMG architecture does not support the EGL_SWAP_BEHAVIOR_PRESERVED_BIT
in EGL configurations. This bit is used only to be able to change the
EGL_SWAP_BEHAVIOR, which matters when the default behavior is not the
one we want. However on IMG, the default swap behavior is the one we
desire.

Change-Id: Iff5980c97df9e41bc837e424baf83b8eadbb7161
 2011-06-02 14:30:06 -07:00
Dianne Hackborn
546d64f56d resolved conflicts for merge of 5c2e4d20 to master 
Change-Id: Iadbee872468ceafb54c5877046c91f6052f3c953
 2011-06-02 14:29:13 -07:00
Andreas Huber
bd24eb5507 Merge "Don't advertise the (old-style) software decoders unless they're actually present." 2011-06-02 14:24:20 -07:00
Shimeng (Simon) Wang
ebf762777a Make sure scale will not go beyond overview scale after rotation. 
Change-Id: If8f7fe131814102e6abf5c8d59888d17a7200003
 2011-06-02 14:11:57 -07:00
Romain Guy
801453f533 am 0f667ff5: (-s ours) am a33bb164: am 4686fb8a: Merge "DO NOT MERGE Correctly implement the CLEAR xfermode." into honeycomb-mr2 
* commit '0f667ff5e57e171311c2b4ec19d29832ffbcd3f7':
  DO NOT MERGE Correctly implement the CLEAR xfermode.
 2011-06-02 14:07:06 -07:00
Gilles Debunne
c6f1f4ac3b am ca6c3a2b: am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume target." into honeycomb-mr2 
* commit 'ca6c3a2bba4445f492117697cb304a014a185159':
  ExternalStorageFormatter takes an optional StorageVolume target.
 2011-06-02 14:06:11 -07:00
Scott Main
4bd705b196 am 2bb7432d: am f18348b1: am a2272130: cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision 
* commit '2bb7432d8ff98650a0d3d84b9ac13649474595f9':
  cherry pick Change-Id: Ia5ac228612569684a4ffc79ab3914442c15edfe2 docs: fix typo and slight revision
 2011-06-02 14:05:04 -07:00
Scott Main
a59f305d11 am a4ab8bd5: am 70f45917: am f5d8ceae: cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos 
* commit 'a4ab8bd518f2226b9a0578a70291bfcc7c17bd9c':
  cherry pick Change-Id: I58ae8210a17f76ff92ee9d064cf42fd4a81ad9b5 docs: fix markup and typos
 2011-06-02 14:04:51 -07:00
Scott Main
69ff8ab05b am b9cb731b: am b7cfc618: am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library 
* commit 'b9cb731bb89bd310a17093262ce6483c557d3d4c':
  cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library
 2011-06-02 14:04:08 -07:00