ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
35,155 Commits 2 Branches 0 Tags 54 MiB
2b7b45f2aa
Commit Graph

35155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
75b13fb030 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Narayan Kamath
4743494987 Merge "Language loading / availablity should repsect defaults enforcement." 2011-06-03 04:34:45 -07:00
satok
d01595f61b am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'e10de072d50cbe6984151cbbdba4dd2f2e8310b9':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:25:14 -07:00
satok
63dc0677ec am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit 'be96408b801666bf196adb0eabff4839e51e63ed':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-02 23:22:35 -07:00
Mathias Agopian
63e7310bec Merge "use quaternions instead of MRPs" 2011-06-02 21:13:13 -07:00
satok
f40ea49fc8 Merge "Update internal states stored in InputMethodManager properly" 2011-06-02 20:59:14 -07:00
Dianne Hackborn
b84e4b11fa am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit '758b67b12386a6ea52d520aef455c3150c9bae03':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:33:22 -07:00
Dianne Hackborn
8453c5fa89 am b46ed763: Add new Fragment API for explicitly saving/restoring state. 
* commit 'b46ed7636be9341b6ce0b158b3d86f34a437e6da':
  Add new Fragment API for explicitly saving/restoring state.
 2011-06-02 19:30:34 -07:00
Tadashi G. Takaoka
05562b04ba 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
fba5de639d 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
9299648156 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
eb2cd90c00 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
63c7259ee0 resolved conflicts for merge of 39ddeae0 to master 
Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
 2011-06-02 18:49:11 -07:00
Jeff Brown
aa3c9b3db9 Merge "Fix ABS_MT_SLOT handling." 2011-06-02 18:31:47 -07:00
satok
79fce1af5c Merge "resolved conflicts for merge of 7e2181c0 to master" 2011-06-02 18:28:58 -07:00
satok
fa088ed673 resolved conflicts for merge of 7e2181c0 to master 
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
 2011-06-03 10:26:15 +09:00
Wink Saville
22ff9d86f6 am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
  CdmaLte: Use SPN from SIM card if SIM card is presend
 2011-06-02 18:24:28 -07:00
Wink Saville
30fa58f972 am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 
* commit '1076f5ff27d35a5a807043bdea49aa40404d9c6b':
  Read CSIM records in LTE on CDMA mode
 2011-06-02 18:24:20 -07:00
Jim Miller
56d1c25cec Merge "Fix 4518876: Disable lock screen rotation on phones." 2011-06-02 18:22:54 -07:00
Wink Saville
bc69a26f21 Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE 2011-06-02 18:21:50 -07:00
Wink Saville
7f1e2d79ca Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE 2011-06-02 18:21:37 -07:00
Jeff Brown
825d9b7d1d am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'c8812761609e532cceb400b112ed9982149c2490':
  Add a preference panel for mouse speed.
 2011-06-02 17:34:03 -07:00
Jeff Brown
576768ca0d am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2 
* commit '8186a5f065fac2b82c90cd18d79cd234bc221402':
  Implement pointer acceleration.
 2011-06-02 17:33:55 -07:00
Jeff Brown
af155f072a am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'e1718de61c20c8d401633f83589f18d2c0c652db':
  Add a preference panel for mouse speed.
 2011-06-02 17:28:07 -07:00
Jeff Brown
ee6acacafc am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2 
* commit '10c3f367a3eb66081c06f1d75107d26e64ce248f':
  Implement pointer acceleration.
 2011-06-02 17:27:48 -07:00
Jeff Brown
c51a9f87bd Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:05 -07:00
Jeff Brown
2127c742d8 Merge "Implement pointer acceleration." into honeycomb-mr2 2011-06-02 17:25:59 -07:00
Dianne Hackborn
c9ab4fc18a Merge "Whoops forgot this." 2011-06-02 17:05:45 -07:00
Brian Carlstrom
b0606c408f Merge "KeyStore.reset changes" 2011-06-02 17:02:38 -07:00
Daniel Lehmann
7dc9b68e6f Merge "Remove the obsolete function that is not used anymore" 2011-06-02 16:59:10 -07:00
Kazuhiro Ondo
778328ccb0 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
75be1f7278 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
9e62407f8e 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
f889eaf379 Merge "resolved conflicts for merge of 54cb63e2 to master" 2011-06-02 16:46:05 -07:00
Dianne Hackborn
b18d467bbc resolved conflicts for merge of 54cb63e2 to master 
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
 2011-06-02 16:44:52 -07:00
Fabrice Di Meglio
04fc3f9d21 Merge "Update BiDiTest app" 2011-06-02 16:37:32 -07:00
Brian Carlstrom
804f499fda 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
dccd089992 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
cc716a0202 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
d4453a32b1 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
1eb9f41102 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
6119e42a00 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
b45e2dfebc Merge "Improve ViewDebug informations for View and LineaLayout" 2011-06-02 16:15:01 -07:00
Brett Chabot
5a62fa3632 Merge "Test runner cleanup: delete unused old classes." 2011-06-02 16:01:46 -07:00
Wink Saville
30a2c34110 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
6c5e36796b 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
4e24cdc035 Merge "resolved conflicts for merge of 5c2e4d20 to master" 2011-06-02 15:04:36 -07:00
Romain Guy
1f06027ee3 Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG." 2011-06-02 14:49:28 -07:00
Shimeng (Simon) Wang
ad7ac99745 Merge "Make sure scale will not go beyond overview scale after rotation." 2011-06-02 14:41:58 -07:00
Dianne Hackborn
3e7b8bebdc resolved conflicts for merge of 5c2e4d20 to master 
Change-Id: Iadbee872468ceafb54c5877046c91f6052f3c953
 2011-06-02 14:29:13 -07:00