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

21036 Commits

Author SHA1 Message Date
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
96b16ed1a8 Merge "Add custom fragment anims to be run when popping backstack" 2011-03-23 11:25:09 -07:00
Fabrice Di Meglio
aa5eb64a0c Merge "Use Harfbuzz instead of ICU4C for computing advances" 2011-03-23 10:56:41 -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
Fabrice Di Meglio
9f82b580d7 Use Harfbuzz instead of ICU4C for computing advances 
- use Harfbuzz shaper for shaping and getting glyphs
- add test app for showing result of drawText() and drawGlyphs()
- add private API in Canvas and Paint for test app

Change-Id: Ia15be216f8636d2d864066e9b7de2f53008c30f6
 2011-03-22 19:36:30 -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
Eric Rowe
94d76925c2 am 2f97217b: am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '2f97217bfca0e89b88498c44a8f0f5ad35091b0a':
  Clean up BT stress tests.
 2011-03-22 19:03:14 -07:00
Eric Rowe
2f97217bfc am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '22e21da663677d12768d38b95d65a747a4a0540b':
  Clean up BT stress tests.
 2011-03-22 19:00:57 -07:00
Eric Rowe
22e21da663 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
 2011-03-22 18:59:00 -07:00
Eric Rowe
5e66ccf5c4 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Dianne Hackborn
32013f1bb1 Merge "Fix holo tabs to work on phone screens." 2011-03-22 16:51:57 -07:00
Dianne Hackborn
03ef0ead5e Fix holo tabs to work on phone screens. 
This isn't perfect.  I think the assets need to be reworked to
have padding at the bottom to account for the bar; in the change
here the text appears on top of the bar because it is aligned
with the bottom.

Also the icons now used for tabs are smaller than the old UI,
making the spacing here strange.  For now I am dealing with all
of this by tweaking the layout dimensions.

Change-Id: I696100edba85a3f384d79aeb2538554c99d48437
 2011-03-22 15:53:24 -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
Eric Fischer
17fd0a4be9 am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05f0b84b23729fcaa2dfe3955a4384b8c9cd440':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:01:10 -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
Eric Fischer
b05f0b84b2 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59: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
Eric Fischer
3a2575f7e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -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
Eric Fischer
765ae04f61 Import revised translations. DO NOT MERGE 
Change-Id: I705ed1f382974b8b12dc024cdb9e2f026e6e86b8
 2011-03-22 13:38:10 -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
Justin Ho
28dcbdcc15 am 263fb828: am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '263fb8285c79a37d3c9dbd0f70d307b92f1ed8fc':
  Fixing list selector theme Bug: 4147203
 2011-03-22 11:42:20 -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
Justin Ho
263fb8285c am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '6a21161095326d097a1af3930b4af0d2470abe0b':
  Fixing list selector theme Bug: 4147203
 2011-03-21 18:14:06 -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
039aa81a67 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Justin Ho
6a21161095 am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
 2011-03-21 17:59:59 -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
Carl Shapiro
8f4c49d86e Merge "Remove dead code from the Zygote initialization." 2011-03-21 17:04:25 -07:00
Justin Ho
9db9a7d3f4 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Carl Shapiro
f973eaae08 Remove dead code from the Zygote initialization. 
Change-Id: Iad66437d6dae01ab94cfade86f3f7416a2896728
 2011-03-21 16:49:16 -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
Eino-Ville Talvala
e309a0fd2e NEW_API: Add getTimestamp() to SurfaceTexture. 
Like getTransformMatrix, getTimestamp provides a timestamp for the
OpenGL texture produced by the latest call to updateTexImage().

Timestamps are measured in nanoseconds, and are monotonically
increasing.  Other properties of the timestamps (zero point,
comparability) depend on the source providing frames to the
SurfaceTexture, and need to be documented by the source.

bug:3300707

Change-Id: I380d94926d0e9f1c77bb5c1576b72d5ef4e2eba1
 2011-03-21 15:38:36 -07:00