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

48065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Gruber
f46821b9d9 am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 
* commit '640f63c2669fc9dc38b349066d4d28111655dc3f':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
 2011-03-23 16:00:30 -07:00
Bill Gruber
640f63c266 am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 
* commit '3bde4594d5794645b5f7e0ff1bf9c4a0b44161b1':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
 2011-03-23 15:51:23 -07:00
Bill Gruber
3bde4594d5 am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 
* commit '0357ec78b82ae104e56c26941d42fa7ef875462b':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
 2011-03-23 15:43:09 -07:00
Romain Guy
ba7c35dcc7 Merge "Take fake bold font property into account. Bug #4159731" 2011-03-23 15:00:24 -07:00
Romain Guy
c7b25be64f Take fake bold font property into account. 
Bug #4159731

For real this time!

Change-Id: I9cb6d70e68d2b57eb9a6d9a6bca8176967192421
 2011-03-23 14:59:20 -07:00
Bill Gruber
0357ec78b8 Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 2011-03-23 14:58:31 -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
Simon Wilson
43831b9290 am d4f4fb98: (-s ours) am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 
* commit 'd4f4fb98ed4c3d0e36a0a873390914007863135a':
  DO NOT MERGE Change WiMAX indicator display
 2011-03-23 14:11:31 -07:00
Simon Wilson
d4f4fb98ed am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 
* commit '03aa986e6b19e436c71801d2e5af6f44521a94ab':
  DO NOT MERGE Change WiMAX indicator display
 2011-03-23 14:06:16 -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
Bill Gruber
0e092f806b DRM API doc scrub 
This change contains information contributed by Sony Corporation.
Bug: 4119363

Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
 2011-03-23 13:21:48 -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
Scott Main
e939f261e0 am bfc10795: am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page 
* commit 'bfc10795f21383b6d48aff3476ceeb79cdfce194':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:45:03 -07:00
Scott Main
bfc10795f2 am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page 
* commit '01b649aa3ac9a8c1d2aff03f51e66438092d0691':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:38:02 -07:00
Scott Main
01b649aa3a am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page 
* commit '7d02efa1029435dfa3a4a9f8449ee1cbda543730':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:33:49 -07:00
Scott Main
7d02efa102 am fb340563: docs: add Asus driver link to oem driver page 
* commit 'fb340563e81f93bc179e51bffc846ac03ff02609':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:25:00 -07:00
Scott Main
fb340563e8 docs: add Asus driver link to oem driver page 
Change-Id: Ia93dd9a6c2c23f236b75a9c83acb8ce4c4b94ffa
 2011-03-23 10:15:36 -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
Robert Greenwalt
15cb32ed9d am 5635dc93: am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit '5635dc9313dc6ca3ea739e4ca36c42a2c58537e9':
  Fix adding of default route.
 2011-03-22 21:40:54 -07:00
Robert Greenwalt
5635dc9313 am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
  Fix adding of default route.
 2011-03-22 21:39:19 -07:00
Robert Greenwalt
0b6d044567 am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.
 2011-03-22 21:37:48 -07:00
Robert Greenwalt
ac70fb8be6 Merge "Fix adding of default route." into honeycomb-mr1 2011-03-22 21:36:04 -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
Robert Greenwalt
edcb4f9d56 Fix adding of default route. 
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway.  Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.

This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).

Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route.  This allows the default add to succeed.

bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
 2011-03-22 18:47:42 -07:00
Dianne Hackborn
32013f1bb1 Merge "Fix holo tabs to work on phone screens." 2011-03-22 16:51:57 -07:00
Carl Shapiro
5c62d9961d Merge "Include strings.h for the strcasecmp prototype." 2011-03-22 16:18:38 -07:00
Wink Saville
1b510a6f32 am 4281a68d: am a97f49c0: Merge "Tweak RIL.java debug." into honeycomb-LTE 
* commit '4281a68db7ee0925c4b1b97110cc0e109737cad5':
  Tweak RIL.java debug.
 2011-03-22 16:09:57 -07:00
Wink Saville
4281a68db7 am a97f49c0: Merge "Tweak RIL.java debug." into honeycomb-LTE 
* commit 'a97f49c02b68d94119f5171472bbadbbad26ba14':
  Tweak RIL.java debug.
 2011-03-22 16:07:23 -07:00
Wink Saville
a97f49c02b Merge "Tweak RIL.java debug." into honeycomb-LTE 2011-03-22 16:05:22 -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
Wink Saville
8b41bc91e5 am b9be4520: am 5d612f16: Merge "Remove unused onResetDone." into honeycomb-LTE 
* commit 'b9be452020775051ff985ff99a172ca1447d1399':
  Remove unused onResetDone.
 2011-03-22 15:34:30 -07:00
Wink Saville
b9be452020 am 5d612f16: Merge "Remove unused onResetDone." into honeycomb-LTE 
* commit '5d612f160180f6c1f59e6cece41c7c3b97b19bf1':
  Remove unused onResetDone.
 2011-03-22 15:32:23 -07:00
Wink Saville
5d612f1601 Merge "Remove unused onResetDone." into honeycomb-LTE 2011-03-22 15:30:41 -07:00
Robert Greenwalt
8b84377f7d Remove unused onResetDone. 
Refactor things a bit.  Promoting GsmDataConnection's apn (ApnSetting) to DataConnection.
Use DataConnection's resetSynchronously rather than tampering with it from another thread.

bug:3486066

Change-Id: I2a7f7368f73c7d5c81e821976efafd56aca7aa69
 2011-03-22 15:13:34 -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
54aa14774a am 17fd0a4b: (-s ours) am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '17fd0a4be9695f644e538e613a145cea3a9b583e':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:03:13 -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