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

51776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Irfan Sheriff
4b3a2c7a19 Merge "Add new states to support wpa_supplicant 0.8" 2011-06-02 13:53:16 -07:00
Adam Powell
2e6053873b Merge "Handle action modes in the IME extract mode view." 2011-06-02 13:36:02 -07:00
Adam Powell
5ee36c48be Handle action modes in the IME extract mode view. 
This presents action modes (such as the one for text editing) in a
less screen-consuming way in the IME extract mode layout. The submit
button is replaced by an "Edit..." button that shows the action mode
menu when clicked.

Still needs UX design and tweaking.

Change-Id: Ia7b3f3446edced0ee5a9abc5e2f0ff16f4fa3ab1
 2011-06-02 13:29:37 -07:00
Andreas Huber
2541c5af17 Don't advertise the (old-style) software decoders unless they're actually present. 
Change-Id: I3753a21e1a7de86432c9c087be9d52028e3a1e1b
 2011-06-02 13:25:12 -07:00
Irfan Sheriff
319da8c4c5 Add new states to support wpa_supplicant 0.8 
Latest supplicant introduces the INTERFACE_DISABLED state. This
is entered when the interface is brought down (which is effectively
done by us and tracked already through the driver stop operation)

Also, added is a state for tracking authentication when supplicant acts as
the SME

Change-Id: I76090068d0ebba6df76f16707da559fcbd7512c5
 2011-06-02 11:18:00 -07:00
Fabrice Di Meglio
5f8d23e7f2 Merge "Add more unit tests for RTL layouts" 2011-06-02 10:58:46 -07:00
Fabrice Di Meglio
88f9fd2316 Add more unit tests for RTL layouts 
- update LinearLayout tests with default case (no horizontalDirection specified)
- add TableLayout tests

Change-Id: I9ad2239fca96b896c5aae4dfe67b8113faf2f96e
 2011-06-02 10:55:58 -07:00
Marc Blank
d2b940ed07 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-06-02 10:43:11 -07:00
Jaikumar Ganesh
eba97ec52f Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-06-02 10:42:30 -07:00
Adam Powell
74e51e26bf 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
2a6627b989 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
be23eb66b8 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
61ad43dc1e am 469465c4: am 0821f274: am 2a108403: I am a dummy. 
* commit '469465c45e42c66201639feb49db5421f5843bbe':
  I am a dummy.
 2011-06-02 10:40:52 -07:00
Albert Mojir
efc1d16374 Bluetooth: correcting return value from cancelDiscovery 
BluetoothAdapter.cancelDiscovery was previously always
returning false.

Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
 2011-06-02 10:30:49 -07:00
James Dong
6c2cb3061d Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based" 2011-06-02 10:22:50 -07:00
Dianne Hackborn
108a61cac5 Merge "resolved conflicts for merge of 76450622 to master" 2011-06-02 10:17:05 -07:00
James Dong
443287068b Do not call getEstimatedBandwidth if the streaming is not HTTP-based 
Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
 2011-06-02 10:13:52 -07:00
Gilles Debunne
e9ff92d7d2 Merge "Remove suggestion span underline on device rotation" 2011-06-02 09:45:32 -07:00
Fabrice Di Meglio
52ae3f345b Merge "Add more unit tests cases for BiDi / RTL" 2011-06-02 09:34:10 -07:00
Fabrice Di Meglio
8226f2b519 Merge "Add more unit tests for RelativeLayout" 2011-06-02 09:33:24 -07:00
Fabrice Di Meglio
c715528c96 Add more unit tests cases for BiDi / RTL 
- update FrameLayout tests
- add more RelativeLayout tests

Change-Id: I2ae522c5e6ec216f7ade45935f8309b543f380b9
 2011-06-02 09:29:03 -07:00
Dianne Hackborn
ed60f81940 resolved conflicts for merge of 76450622 to master 
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
 2011-06-02 09:20:52 -07:00
Glenn Kasten
c49b870adf Merge "Use android.os.Process.THREAD_PRIORITY_* symbols" 2011-06-02 07:26:17 -07:00
Glenn Kasten
d3092e3157 Merge "Remove unnecessary level of priority indirection" 2011-06-02 07:24:14 -07:00
Eric Fischer
279ad356fe 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
368f2bd054 Merge "Merge WebKit at r80534: Update user agent string." 2011-06-02 03:03:15 -07:00
satok
cc28a669f6 Merge "Add an api to get the display name for InputMethodSubtype" 2011-06-02 02:34:32 -07:00
satok
4f31353cb3 Add an api to get the display name for InputMethodSubtype 
Bug: 4321667

Change-Id: I55aa844ff33dae0cf8ef00072e87727992eb77c1
 2011-06-02 18:26:36 +09:00