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

15687 Commits

Author SHA1 Message Date
Romain Guy
13f35f3ce6 Correctly check bottom padding in setPadding(). 
Change-Id: Ie8099d37ad865acc559c4a4d34eb84960a1a19f3
 2011-03-24 12:03:17 -07:00
Romain Guy
c78504dca6 Merge "Use the correct API to query system properties." 2011-03-23 19:57:23 -07:00
Romain Guy
aaceeb0c5b Use the correct API to query system properties. 
Change-Id: Ie120dee0e24959d4db3fdb0100b6d8fe7fe46cdb
 2011-03-23 19:56:13 -07:00
Teng-Hui Zhu
d9f68bc9e0 am 842b914f: am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit '842b914f26633aa94f3c63fbfc6a6b521904e1b8':
  When the video is not on the front, it should be paused
 2011-03-23 17:38:28 -07:00
Teng-Hui Zhu
842b914f26 am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit 'a7605d3b2ec9526fc369e5e0a1a37880db2c0694':
  When the video is not on the front, it should be paused
 2011-03-23 17:36:03 -07:00
Teng-Hui Zhu
a7605d3b2e am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1 
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
  When the video is not on the front, it should be paused
 2011-03-23 17:34:15 -07:00
Romain Guy
6325b622ad Merge "Apply color filters to bitmaps." 2011-03-23 16:56:18 -07:00
Teng-Hui Zhu
1e26d82ffa When the video is not on the front, it should be paused 
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
 2011-03-23 16:56:12 -07:00
Romain Guy
56215274f2 Apply color filters to bitmaps. 
Change-Id: I36354a6a2d330b2e61ed2af12b6701b151880288
 2011-03-23 16:55:38 -07:00
Teng-Hui Zhu
d6f8f798f2 am fee1d146: am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit 'fee1d146a3285e887712150496bbf002f4945079':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:09:46 -07:00
Teng-Hui Zhu
fee1d146a3 am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit '503735099d51e9701be4737dff4e74b35361d371':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:07:57 -07:00
Teng-Hui Zhu
503735099d am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
  Make sure the full screen playing continue when timeout
 2011-03-23 16:06:10 -07:00
Teng-Hui Zhu
efb8eda41a Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1 2011-03-23 16:03:04 -07:00
Teng-Hui Zhu
2deec6651c Make sure the full screen playing continue when timeout 
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
 2011-03-23 15:29:22 -07:00
Scott Main
f0e8f367ca am 8346a6c2: am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error 
* commit '8346a6c27311afdce4755807a23a8edcf1f52f66':
  docs: fix markup error
 2011-03-23 14:49:38 -07:00
Scott Main
8346a6c273 am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error 
* commit 'ee7cfaf28969998ca15800f99bcdab2596051865':
  docs: fix markup error
 2011-03-23 14:47:34 -07:00
Scott Main
ee7cfaf289 am 18cd686f: am ef6b305b: docs: fix markup error 
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
  docs: fix markup error
 2011-03-23 14:43:35 -07:00
Scott Main
18cd686fc8 am ef6b305b: docs: fix markup error 
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
  docs: fix markup error
 2011-03-23 14:32:44 -07:00
Scott Main
ef6b305b93 docs: fix markup error 
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
 2011-03-23 14:23:02 -07:00
repo sync
adbf9d8585 am d5ba9c22: Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit 'd5ba9c22236346578ce34e3e8b475b8cad9773dd':
  remove the code that clears the passwords when the sim is replaced with a different one.
 2011-03-23 13:49:35 -07:00
repo sync
d5ba9c2223 Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-23 13:46:32 -07:00
Chet Haase
bc377841db Add custom fragment anims to be run when popping backstack 
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.

The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.

Change-Id: I2e132b3890838358e496149f18a25037a59990aa
 2011-03-23 09:35:00 -07:00
Mathias Agopian
462db220a2 fix [4056232] Deprecate Sensor.TYPE_TEMPERATURE and add Sensor.TYPE_AMBIENT_TEMPERATURE 
Bug: 4056232
Change-Id: Idf165460fc083f856c320f0f6f8841d73661c829
 2011-03-22 19:12:13 -07:00
Adam Powell
e9f66af90a Merge "Fix bug 4142917 - Add support for specifying a custom home icon in action bar" 2011-03-22 14:13:34 -07:00
Adam Powell
1969b87990 Fix bug 4142917 - Add support for specifying a custom home icon in action bar 
Add ActionBar methods for setting icon and logo.

Change-Id: I6151689138c734b7212c3469b8ba8f28f0fd5ec4
 2011-03-22 14:11:06 -07:00
Vasu Nori
aceaa22560 Merge "bug:4090903 allow bindargs on attach database statement" 2011-03-22 14:09:01 -07:00
Teng-Hui Zhu
8d2b7f350b am 6e5276cf: am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '6e5276cf001112f93b3ca811d220331cc74cd8df':
  fix for pause when loading
 2011-03-22 14:00:20 -07:00
Teng-Hui Zhu
6e5276cf00 am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '2c6f2816d7308693a89f1214c2976512eb275d8a':
  fix for pause when loading
 2011-03-22 13:58:16 -07:00
Teng-Hui Zhu
2c6f2816d7 am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -07:00
Teng-Hui Zhu
158fbdb29b fix for pause when loading 
bug:4148903

Change-Id: Ib0b59c8c36eb5df8c6755156a5d2753f84ad9677
 2011-03-22 12:02:11 -07:00
repo sync
9ab66ff42f resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp 
Change-Id: Ic82ab20e216d810f6372c833ac49c3856449c09c
 2011-03-22 11:47:39 -07:00
Teng-Hui Zhu
fdef2cb760 am c81d7e0a: am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit 'c81d7e0ae802626e9e7a09bdc70afe4952c2ac96':
  Fix a crash
 2011-03-22 11:42:37 -07:00
Adam Powell
37f421c594 Merge "Fix bug 3175131 - listviews don't highlight properly" 2011-03-22 10:48:52 -07:00
Adam Powell
becb0be2bb Fix bug 3175131 - listviews don't highlight properly 
Fix up selector drawable state when we resurrect a selection.

Change-Id: Id883c8b416207a50951ec2852826b1eee17bc50c
 2011-03-22 00:21:07 -07:00
Romain Guy
e455cd4164 Merge "Remove unnecessary test." 2011-03-21 18:22:03 -07:00
Romain Guy
566c33105a Remove unnecessary test. 
Change-Id: I7cb797f4be70ecd40a65c51e92a8e8722e49dec2
 2011-03-21 18:21:28 -07:00
Teng-Hui Zhu
c81d7e0ae8 am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit 'f2c44a79d90096e5f0edf698e27d291d439f0138':
  Fix a crash
 2011-03-21 18:16:02 -07:00
Teng-Hui Zhu
f2c44a79d9 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
 2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
217c6c7fbe am 67440893: am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '67440893ee32f057d2695b0eea9811e289b68603':
  Support loading image and paused image for inline video
 2011-03-21 17:48:59 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash 
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
 2011-03-21 17:38:21 -07:00
Teng-Hui Zhu
67440893ee am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
  Support loading image and paused image for inline video
 2011-03-21 16:28:04 -07:00
Vasu Nori
cc1eaf6f7b bug:4090903 allow bindargs on attach database statement 
code incorrectly assumed that certain statements (like ATTACH DATABASE)
will never have bindargs.

Change-Id: I62eddbdf8e15947e8debf5052c7248113a3b9b57
 2011-03-21 16:02:25 -07:00
Vasu Nori
b2613555f6 Merge "fix broken logTimeStat stuff" 2011-03-21 15:52:43 -07:00
Teng-Hui Zhu
f82e5a2c90 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00
Romain Guy
43e7aeb37e Merge "Add support for drawPoint() and drawPoints()." 2011-03-21 13:12:28 -07:00
Romain Guy
ed6fcb034b Add support for drawPoint() and drawPoints(). 
Change-Id: I01bef50c08ec3160f8d40dc060b2cf6c2e4d7639
 2011-03-21 13:11:49 -07:00
Fred Quintana
17f95e92ed am 661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 
* commit '661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
  remove the code that clears the passwords when the sim is replaced with a different one.
 2011-03-21 11:33:34 -07:00
Fred Quintana
661e9b371f Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 2011-03-21 11:04:23 -07:00
Teng-Hui Zhu
265db32f31 Support loading image and paused image for inline video 
bug:4142131

Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
 2011-03-21 10:36:00 -07:00
Svetoslav Ganov
a3d17a753d Merge "Text in accessibility events not consistent" 2011-03-18 17:16:14 -07:00