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

51906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
b93ffdb5d5 am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 
* commit 'b30dda6b550fedcf5c3b15671d483205a7757e1b':
  Framework: bugfix for menu selector not showing up properly.
 2011-06-03 14:28:26 -07:00
Dianne Hackborn
9f2f3752ae am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 
* commit 'c11f6c3e33c9f1e3964cb2427f82509fc97e3527':
  Compatibility mode never needed for normal size screens.
 2011-06-03 14:28:18 -07:00
Dianne Hackborn
678d344bcb resolved conflicts for merge of b9e2f68b to master 
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
 2011-06-03 14:15:10 -07:00
Adam Powell
3c784fe6a0 am d19fbe34: am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit 'd19fbe34e33fa79121e2822d0063f3aec350b3e5':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-03 14:03:20 -07:00
Scott Main
3f27392b42 am 1dd5fba9: (-s ours) am 2b876a31: am f5992953: docs: fix typos 
* commit '1dd5fba94927119133dd56d41714c1a5f3b82611':
  docs: fix typos
 2011-06-03 14:03:12 -07:00
Robert Greenwalt
c5e626c393 am 903cd57f: am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 
* commit '903cd57f67fee8708cc6349ca1aac4de01831798':
  Remove redundent getCurrentCdmaDataConnectionState
 2011-06-03 13:58:47 -07:00
Philip Milne
160cbbb9ac Merge "Response to code review for GridLayout:" 2011-06-03 13:46:34 -07:00
Jim Miller
33f27e2c83 Merge "Fix 4368649: Fix visible password issue on password unlock screen" 2011-06-03 13:32:34 -07:00
Jim Miller
5a1ff22f20 Fix 4368649: Fix visible password issue on password unlock screen 
Change-Id: I9ec30898e27d49d82d11dfcf3abb4273e4277316
 2011-06-03 13:30:41 -07:00
Philip Milne
aa616f31fe Response to code review for GridLayout: 
. Fixed spelling.
. Added comments on internal methods.
. Adopted the suggested internal name changes to improve clarity.
. Added UNDEFINED constant to public API to avoid making reference to Integer.MAX_VALUE in docs.
. Added final everywhere, then removed it.
. Make the Interval class package private so that it can be put somewhere more general later.
. Tidy code, removing maximize flag throughout.
. Remove last of allocations taking place during layout.
. Implement measureChild() etc.
. Added LinearLayout alignment compatibility mode, and made it the default.

Change-Id: I6a4ffa022d97d68138d1903d3830a20278815435
https://android-git.corp.google.com/g/#change,109891
 2011-06-03 13:22:52 -07:00
Dianne Hackborn
455591b913 am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'c691d7f9a3621d5ef9b9d48e95c644a318b36322':
  Forgot this file.
 2011-06-03 13:17:45 -07:00
Dianne Hackborn
50469db071 am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit '7322e557cfe42da42779625d69ced2db74a9df90':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-06-03 13:17:00 -07:00
Joe Malin
8c56154d9a am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit '409db558b3f47ac28f1291d82bef15a07b2920c3':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-06-03 13:16:29 -07:00
Dianne Hackborn
f3b57def93 resolved conflicts for merge of 7e193916 to master 
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
 2011-06-03 12:26:54 -07:00
Jeff Brown
201e6606e7 am f257c4b5: (-s ours) am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 
* commit 'f257c4b575ad1bda77decfc2ecb5df234762247e':
  Button state should reflect actual buttons. (DO NOT MERGE)
 2011-06-03 11:21:42 -07:00
Amith Yamasani
99ce8abc3f am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2 
* commit '42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
  Use Holo background and proper padding for App Permissions UI.
 2011-06-03 11:11:22 -07:00
Stephen Hines
dad7fdedbc Merge "Improve validation in RS FieldPacker." 2011-06-03 10:41:08 -07:00
Eric Fischer
3124e6ebe7 Merge "Import revised translations." 2011-06-03 10:22:58 -07:00
Daniel Sandler
30a9ef5126 Merge "Restore status bar on phones." 2011-06-03 08:10:03 -07:00
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
Daniel Sandler
631cb3d591 Restore status bar on phones. 
Bug: 4529373
Change-Id: I669774e734cb5f40c8944ffb5161c3b4bf7b2996
 2011-06-03 01:27:06 -04: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
Stephen Hines
e27832acc0 Improve validation in RS FieldPacker. 
Change-Id: I9f6a58048129db4978c893c2dc591b0ed825d05f
 2011-06-02 19:36:41 -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
Eric Fischer
95cab5414d Import revised translations. 
Change-Id: Iffa8d66bf709a6daa6a3cd464ac55b6e34857d71
 2011-06-02 16:54:11 -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