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

52110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Stadler
237574444b DO NOT MERGE Use unchecked admin lookup for getStorageEncryption() 
Due to a copy/paste typo, getStorageEncryption() was protected by
getActiveAdminForCallerLocked(), which made the API unreadable if the
caller is not an admin.  This doesn't match the rest of the DPM API which
allows the "get" calls to be made anonymously.

This fix supercedes the proposed workaround CL in the DPM ApiDemo sample.

Backport of: If1a6237634e97ced09a7c6a8876bb6b0f60c9be9

Change-Id: I728b2d85878b7c73a063c906529f0d973e166b49
 2011-06-02 16:37:39 -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
Jeff Brown
1a84fd1fb7 Add a preference panel for mouse speed. 
Bug: 4124987
Change-Id: I3ce175d268a1d043cf5878481261b1049a15a149
 2011-06-02 15:39:21 -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
Jeff Brown
19c97d46fb Implement pointer acceleration. 
Bug: 4124987
Change-Id: I1f31a28f1594c55302ccabe13fe3ca6d2ff71d50
 2011-06-02 14:12:05 -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
Kazuhiro Ondo
c46a085eed Read CSIM records in LTE on CDMA mode 
In case of CDMA and LTE hybrid system, UICC card contains
both USIM and CSIM data. FW needs to read out from both
to aqcuire information required for the service.

Change-Id: I4a714252bc97c037fa419352f23d8f38f6206406
 2011-06-02 14:04:24 -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
Kazuhiro Ondo
c91c7f92c9 CdmaLte: Use SPN from SIM card if SIM card is presend 
Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
 2011-06-02 13:58:11 -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
James Dong
bebc99d6fa Initial-checkin for ON2 Software AVC/H264 decoder 
o when neon is present, the performance gain of On2 AVC software decoder
  over PV software decoder is more than 30%.

o In addition, it fixes some known PV software decoder issues like missing
  output frames

o allow both pv and on2 software avc to be available for easy comparision

o change output frames from 8 to 16

Change-Id: I567ad1842025ead7092f0c47e3513d6d9ca232dd
 2011-06-02 12:32:46 -07:00
Vikas Arora
d0881d95e2 Add WebP Mime-Type support in Android Media File 
Change-Id: Ifaa64c8fc55d1f1ad14db3057821696b565e0c26
 2011-06-03 00:13:36 +05:30
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
Scott Main
b9040e7749 am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2 
* commit '5b8342cf193a0255b254a5d833e6a2fac04b4b10':
  cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
 2011-06-02 10:56:17 -07:00
Scott Main
59a3ad16f5 am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2 
* commit 'd5335253cb55a48c0921fb23bb8dee7217f475aa':
  cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
 2011-06-02 10:56:14 -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
Scott Main
7c8b81c536 am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2 
* commit 'b04ac7ac0b3fcc8a16f7f81476a99a4dc44f8ae0':
  Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
 2011-06-02 10:55:49 -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