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

52950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
f930232fd1 Fix a major problem in fragment lifecycle. 
When animating away a fragment, we were not putting it through
the last part of its lifecycle (onDestroy() etc).

Also, retained fragments that have a target were broken.  Oops.

Change-Id: I5a669b77a2f24b581cde2a0959acf62edb65e326
 2011-06-14 20:47:44 -07:00
Dianne Hackborn
938ef7aeb7 Merge "resolved conflicts for merge of e95c07bd to master" 2011-06-14 20:41:27 -07:00
Adam Powell
c391a9888c Merge "Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab with null text" 2011-06-14 20:29:03 -07:00
Adam Powell
251df77861 Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab 
with null text

Change-Id: I6c287c95bafa732018048c11933ddba82fa26d9f
 2011-06-14 20:24:34 -07:00
Bart Sears
c02fc922ff Merge "Latest drop of DroidSansFallback.ttf from Monotype" 2011-06-14 20:23:15 -07:00
Dianne Hackborn
ca2832bc60 am 027e9e28: am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 
* commit '027e9e28b2880b8e50912d7c25e68e8f196bb66b':
  Fix issue #4592768: Xoom display does not resize when...
 2011-06-14 19:22:42 -07:00
Dianne Hackborn
027e9e28b2 am 4e04380d: Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 
* commit '4e04380d0a42347013808ee2058c786582ad548f':
  Fix issue #4592768: Xoom display does not resize when...
 2011-06-14 19:19:25 -07:00
Dianne Hackborn
4e04380d0a Merge "Fix issue #4592768: Xoom display does not resize when..." into honeycomb-mr2 2011-06-14 19:16:46 -07:00
Xia Wang
4a49b95d4b Merge "Add more opengl benchmark test: - all apps in launcher - shortcuts of apps in home page" 2011-06-14 19:08:22 -07:00
James Dong
05be9531b6 Second attempt to fix the broken build 
o due to a link to a hidden method

Change-Id: Ia488743e9bff6854253696cc368facbd50d2d8f4
 2011-06-14 18:51:24 -07:00
James Dong
d52ad9ca8d Fix broken build 
Change-Id: Icf7e33a3a4d9b430cd8cbc97801df24a94f9e079
 2011-06-14 18:21:59 -07:00
Glenn Kasten
370a71bcaf Merge "Bug 4608375" 2011-06-14 17:54:25 -07:00
Robert Ly
2ecb884f75 am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 
* commit 'b481a6007f3c0e9f50ddb2e126fc5d8188961b25':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
 2011-06-14 17:52:55 -07:00
Robert Ly
8a8f82bbd6 am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 
* commit '4963cd0bd1d63fe5a444b2299758d2a2696776f1':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
 2011-06-14 17:51:08 -07:00
Robert Ly
b481a6007f am c7731e07: Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 
* commit 'c7731e070e09007fdd002fd44dfe35bdeffbaac5':
  cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d
 2011-06-14 17:47:51 -07:00
Robert Ly
4963cd0bd1 am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 
* commit '1a3e7cf259ef8eecdea236b3cba1608e1bd871e3':
  cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
 2011-06-14 17:46:07 -07:00
Robert Ly
c7731e070e Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7d" into honeycomb-mr2 2011-06-14 17:45:04 -07:00
Robert Ly
1a3e7cf259 Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc" into honeycomb-mr2 2011-06-14 17:43:38 -07:00
Eric Rowe
7af75afb2c Fix external storage bug for BT stress tests 
Change-Id: Ib6cfe80449037cfee5072145fb3a4ae0e79abf06
 2011-06-14 17:26:44 -07:00
Romain Guy
85407fac7b Merge "Add TextureView.getBitmap()" 2011-06-14 17:08:36 -07:00
Fabrice Di Meglio
67f8de04fc Fix Gravity start/end 
- fix missing attribute value change
- update BiDiTest app

Change-Id: I0bb8a1ebf0b6097b7b8d488580fea6e882202e23
 2011-06-14 17:08:32 -07:00
Nick Pelly
15329918e6 Merge "minor documentation fixes" 2011-06-14 17:06:54 -07:00
Romain Guy
77a811610f Add TextureView.getBitmap() 
This API can be used to get a Bitmap copy of the content of a
TextureView.

Change-Id: I07522216c353720fba5cab333174f58f484eb911
 2011-06-14 17:06:53 -07:00
James Dong
113543c909 Merge "Enforce the rule that the timestamp from timelapse video source monotically increases" 2011-06-14 17:01:11 -07:00
James Dong
805bad6505 Merge "Update MediaPlayer and MediaRecorder javadoc" 2011-06-14 17:00:49 -07:00
Dianne Hackborn
dad0e40221 Fix issue #4592768: Xoom display does not resize when... 
...plugging in HDMI cable connected to a HDMI monitor

Change-Id: If3394e972131aa5124db2d1abf23b2214512773a
 2011-06-14 16:45:21 -07:00
Robert Ly
5e69c0f556 am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 
* commit '1dbb707592f0aff35e5ca1115f7ee278a5977c42':
  cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
 2011-06-14 16:41:55 -07:00
Robert Ly
f3c9a2517a am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 
* commit '17cddaf2a64c8392a8e852283e720d3abdaca9b3':
  Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
 2011-06-14 16:41:52 -07:00
Robert Ly
2aeafe0baa am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 
* commit 'b5c31b8a11d4f898b0f9aa6eaf7a89195d800409':
  Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
 2011-06-14 16:41:49 -07:00
Ben Dodson
542f2409d9 minor documentation fixes 
Change-Id: I8ff5ad7c310fdbf0ade9d66e075d09e293182b89
 2011-06-14 16:40:23 -07:00
Robert Ly
1dbb707592 am 8467cd7f: Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 
* commit '8467cd7f90a23c345b41cfcdcc62f1f8e3716c37':
  cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
 2011-06-14 16:38:08 -07:00
James Dong
9ddb7888b4 Update MediaPlayer and MediaRecorder javadoc 
o Adding some description to the Looper requirement for receiving callbacks

Change-Id: I79e7014c521f2286e6c2ccea1097d7e7467eb9ee
 2011-06-14 16:38:08 -07:00
Robert Ly
17cddaf2a6 am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 
* commit '409b9a4cad1d2dad43e647fc63a4ab1f3435d437':
  Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
 2011-06-14 16:38:05 -07:00
Robert Ly
b5c31b8a11 am 194f4745: Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 
* commit '194f47451ce3a0d346e362dfd8753057f41c765d':
  Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"
 2011-06-14 16:38:02 -07:00
Robert Ly
8467cd7f90 Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac" into honeycomb-mr2 2011-06-14 16:36:17 -07:00
Robert Ly
409b9a4cad Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2 2011-06-14 16:35:22 -07:00
Robert Ly
194f47451c Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb"" into honeycomb-mr2 2011-06-14 16:35:12 -07:00
Fabrice Di Meglio
e460e6d718 Merge "Add View.getResolvedLayoutDirection()" 2011-06-14 16:23:06 -07:00
Fabrice Di Meglio
c0053223be Add View.getResolvedLayoutDirection() 
- update Callback2 interface
- update Gravity.getAbsoluteGravity() and Gravity.apply() to be more generic
 by changing "boolean isRtl" parameter to "int layoutDirection"
- fix BiDiTests for RTL FrameLayout

Change-Id: I97bb456c22d5fd3ecb34f08564ce4dbed37e7459
 2011-06-14 16:16:39 -07:00
Dianne Hackborn
3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master 
Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
 2011-06-14 16:13:26 -07:00
John Reck
9b90d553bb Support for getting the background color 
Change-Id: I58a52f79e5a50dbb2cd1ba81d13e95ed9a1b7095
 2011-06-14 15:53:46 -07:00
Robert Ly
051d16ebec resolved conflicts for merge of 398d021b to master 
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
 2011-06-14 15:50:38 -07:00
Amith Yamasani
2bcd9c6e7b am eb5e633a: am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit 'eb5e633a2488456874f829263fa6cb96588d25aa':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:42:36 -07:00
Amith Yamasani
eb5e633a24 am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 
* commit '608a200d2ed19540bb356d54e96f72c8c6b089b1':
  Stability fixes for PreferenceFragments.
 2011-06-14 15:38:31 -07:00
Amith Yamasani
608a200d2e Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2 2011-06-14 15:35:13 -07:00
Gloria Wang
2fd17c4544 Merge "To remove log spam in the Forward Lock DRM plugin. Fix for bug 4619159." 2011-06-14 15:35:11 -07:00
Robert Ly
36107a37a2 am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e" into honeycomb-mr2 
* commit '0b7d7f53a958132eb539fc81130423878c2db650':
  cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
 2011-06-14 15:25:00 -07:00
Robert Ly
86f1ea099a am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb" into honeycomb-mr2 
* commit 'ae6dc0c5e213ce5ca3c504020bc73993e1aceb9a':
  cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cb
 2011-06-14 15:22:51 -07:00
Robert Ly
f5d0eb92fb am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7" into honeycomb-mr2 
* commit 'ff46480e748555a923242af4238ec8d4822fd2ae':
  cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7
 2011-06-14 15:22:47 -07:00
Wink Saville
02f4e4f981 am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 
* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
  Enforce provision check for CSIM record only.
 2011-06-14 15:22:42 -07:00