ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
34,955 Commits 2 Branches 0 Tags 54 MiB
fa088ed673
Commit Graph

34955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
satok
fa088ed673 resolved conflicts for merge of 7e2181c0 to master 
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
 2011-06-03 10:26:15 +09: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
Andreas Huber
446ac79023 Merge "Don't advertise the (old-style) software decoders unless they're actually present." 2011-06-02 14:24:20 -07:00
Romain Guy
0b72fadde1 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
039210e224 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
dd9ae9c124 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
0c60d8bbfb 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
fae279e422 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
Irfan Sheriff
14b636a6ac Merge "Add new states to support wpa_supplicant 0.8" 2011-06-02 13:53:16 -07:00
Adam Powell
eb34983c3b Merge "Handle action modes in the IME extract mode view." 2011-06-02 13:36:02 -07:00
Fabrice Di Meglio
44259bf163 Merge "Add more unit tests for RTL layouts" 2011-06-02 10:58:46 -07:00
Marc Blank
3196f0b134 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-06-02 10:43:11 -07:00
Jaikumar Ganesh
f0e2131e2e Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-06-02 10:42:30 -07:00
Adam Powell
32e15ba3c8 am d31320d5: (-s ours) am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2 
* commit 'd31320d58fa3597962ed47d131aef6340beee4fa':
  DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
 2011-06-02 10:42:12 -07:00
Kenny Root
79d500aa5c am 2b26dee8: (-s ours) am 5e34a194: am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 
* commit '2b26dee8b2b229e0b7f1785fdef2cb4e977c8310':
  Break apart queries to getInstalled* API DO NOT MERGE
 2011-06-02 10:41:58 -07:00
Scott Main
8dfd140cb3 am dcf305eb: (-s ours) am 101139cc: am c3123961: DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility 
* commit 'dcf305ebf991ff13a56b71118968d905ff636eca':
  DO NOT MERGE cherry pick Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662 docs: add accepted values for setting status bar visibility
 2011-06-02 10:41:29 -07:00
Dianne Hackborn
de1d64a064 am 469465c4: am 0821f274: am 2a108403: I am a dummy. 
* commit '469465c45e42c66201639feb49db5421f5843bbe':
  I am a dummy.
 2011-06-02 10:40:52 -07:00
James Dong
cdfbb561ae Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based" 2011-06-02 10:22:50 -07:00
Dianne Hackborn
74798f1d3d Merge "resolved conflicts for merge of 76450622 to master" 2011-06-02 10:17:05 -07:00
Gilles Debunne
7856e7e9e0 Merge "Remove suggestion span underline on device rotation" 2011-06-02 09:45:32 -07:00
Fabrice Di Meglio
bb7ef4cab9 Merge "Add more unit tests cases for BiDi / RTL" 2011-06-02 09:34:10 -07:00
Fabrice Di Meglio
58f6563727 Merge "Add more unit tests for RelativeLayout" 2011-06-02 09:33:24 -07:00
Dianne Hackborn
e418eaa8e7 resolved conflicts for merge of 76450622 to master 
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
 2011-06-02 09:20:52 -07:00
Glenn Kasten
ac47e958ae Merge "Use android.os.Process.THREAD_PRIORITY_* symbols" 2011-06-02 07:26:17 -07:00
Glenn Kasten
2e7ff4ba27 Merge "Remove unnecessary level of priority indirection" 2011-06-02 07:24:14 -07:00
Eric Fischer
31684b24e0 am 0bb63c58: (-s ours) am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '0bb63c58a464e7df60de103319204b7b590e5d75':
  Import revised translations.  DO NOT MERGE
 2011-06-02 03:21:06 -07:00
Ben Murdoch
e5d1139a82 Merge "Merge WebKit at r80534: Update user agent string." 2011-06-02 03:03:15 -07:00
satok
97c22eec57 Merge "Add an api to get the display name for InputMethodSubtype" 2011-06-02 02:34:32 -07:00