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

81606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
6ce20c4d4f am e7c08bcd: am 87f86e64: Merge "Replace AndroidEmoji.ttf for UI optimization" into jb-dev 
* commit 'e7c08bcd48b5025370f5858ac0b4bfc22b50980e':
  Replace AndroidEmoji.ttf for UI optimization
 2012-07-11 13:34:00 -07:00
Teng-Hui Zhu
5a9bb64eaf Merge "Release the media player when trimming memory" 2012-07-11 13:31:02 -07:00
Justin Ho
e7c08bcd48 am 87f86e64: Merge "Replace AndroidEmoji.ttf for UI optimization" into jb-dev 
* commit '87f86e640e1192e9cc37e25393ccdff7862acdd8':
  Replace AndroidEmoji.ttf for UI optimization
 2012-07-11 13:25:53 -07:00
Justin Ho
87f86e640e Merge "Replace AndroidEmoji.ttf for UI optimization" into jb-dev 2012-07-11 13:22:27 -07:00
Victoria Lease
cae28fa051 Merge "Remove hardcoded typeface pointers" 2012-07-11 12:49:12 -07:00
Billy Hewlett
d6deccb346 Remove hardcoded typeface pointers 
There were a number of extraneous typeface pointers, one per
language, in TextLayoutCache.  Removing these makes adding additional
supported fonts easier.  This checkin now properly
unrefs typefaces returned by SkCreateTypefaceForScript.  Additionally,
all harfbuzz shaped fonts (with exceptions Greek, Cyrillic, Hangul)
should call SkCreateTypefaceForScript.

Change-Id: I7dcf603a89e5ff52c6dab8fb87ae1807a79c351c
 2012-07-11 08:55:59 -07:00
Justin Ho
d59bf6491c am b64e0f97: am 1b637fba: Merge "Remove gradients from navbar glow highlights." into jb-dev 
* commit 'b64e0f971d03237a4fc6af101e76db669fb2fd15':
  Remove gradients from navbar glow highlights.
 2012-07-11 07:40:35 -07:00
Justin Ho
b64e0f971d am 1b637fba: Merge "Remove gradients from navbar glow highlights." into jb-dev 
* commit '1b637fbad4de204f737e2617da04eed7b334e945':
  Remove gradients from navbar glow highlights.
 2012-07-11 07:38:02 -07:00
Justin Ho
1b637fbad4 Merge "Remove gradients from navbar glow highlights." into jb-dev 2012-07-11 07:35:37 -07:00
Xavier Ducrohet
8807d427c6 am 54059cd3: (-s ours) am 15c15eaa: Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev 
* commit '54059cd38de24bbffc2525b56955535df73bf1eb':
  Replace LruCache implementation for layoutlib. do not merge.
 2012-07-10 18:41:21 -07:00
Xavier Ducrohet
54059cd38d am 15c15eaa: Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev 
* commit '15c15eaac51c0c375d18fb70cd1bd066d87b034e':
  Replace LruCache implementation for layoutlib. do not merge.
 2012-07-10 18:38:21 -07:00
Xavier Ducrohet
15c15eaac5 Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev 2012-07-10 18:34:40 -07:00
Raph Levien
39c8738b89 am 23316a1e: (-s ours) am 00139b22: Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev 
* commit '23316a1ef8868bc641ed72d42839c20b7b86fadb':
  Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE
 2012-07-10 18:10:28 -07:00
Raph Levien
23316a1ef8 am 00139b22: Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev 
* commit '00139b2238562780d66c2ebb8a0675fbe7d896b7':
  Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE
 2012-07-10 18:07:27 -07:00
Junichi Monma
514bdc3b6e Replace AndroidEmoji.ttf for UI optimization 
Bug: 6785630
Change-Id: Ie236c59704138263831930e3682a7ee9ac2f84b1
 2012-07-11 10:06:56 +09:00
Raph Levien
00139b2238 Merge "Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE" into jb-dev 2012-07-10 18:05:12 -07:00
Daniel Sandler
25a916d6bc Remove gradients from navbar glow highlights. 
Should reduce unsightly banding.

Bug: 6789484
Change-Id: I1bd552d571651ff614a867c2e52b8532b6e22749
 2012-07-10 21:01:55 -04:00
Stephen Hines
010835d471 Merge "Fix RS matrix docs regarding row/column and x/y." 2012-07-10 17:26:37 -07:00
Yu Shan Emily Lau
0fb362b41e am 413b5c19: am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev 
* commit '413b5c19a681bb4fda4cc5a6e8347d37792aa905':
  Remove the unnecssary intent call.
 2012-07-10 16:51:20 -07:00
Yu Shan Emily Lau
413b5c19a6 am 10366b93: Merge "Remove the unnecssary intent call." into jb-dev 
* commit '10366b93157718ed8621f5af087e7a771191b41a':
  Remove the unnecssary intent call.
 2012-07-10 16:49:31 -07:00
Yu Shan Emily Lau
10366b9315 Merge "Remove the unnecssary intent call." into jb-dev 2012-07-10 16:47:09 -07:00
Yu Shan Emily Lau
e60393ae71 Remove the unnecssary intent call. 
Change-Id: Ia0a460ca8532ccb2f4b0f0205d192b1ba907b5b6
 2012-07-10 16:45:38 -07:00
Wink Saville
ec4ed1af2c am 1408b9c5: am d2246930: Merge "Preserve retryCount when retrying." into jb-dev 
* commit '1408b9c5b339a368e20ca8f7dac019e56f19089d':
  Preserve retryCount when retrying.
 2012-07-10 16:42:52 -07:00
Wink Saville
c81270e5b1 am 8461680f: am e87c71f8: Merge "When reconnecting disassociate dc and apnContext." into jb-dev 
* commit '8461680fab7c4baf8bef0b932d74d817b07fd786':
  When reconnecting disassociate dc and apnContext.
 2012-07-10 16:42:49 -07:00
Wink Saville
1408b9c5b3 am d2246930: Merge "Preserve retryCount when retrying." into jb-dev 
* commit 'd22469302707d87ee56d7a30dd8b38e671ee0179':
  Preserve retryCount when retrying.
 2012-07-10 16:40:09 -07:00
Wink Saville
8461680fab am e87c71f8: Merge "When reconnecting disassociate dc and apnContext." into jb-dev 
* commit 'e87c71f8c1db547831e8f91be765a6eecee27342':
  When reconnecting disassociate dc and apnContext.
 2012-07-10 16:40:01 -07:00
Wink Saville
d224693027 Merge "Preserve retryCount when retrying." into jb-dev 2012-07-10 16:38:44 -07:00
Wink Saville
e87c71f8c1 Merge "When reconnecting disassociate dc and apnContext." into jb-dev 2012-07-10 16:38:09 -07:00
Jean-Michel Trivi
82a8c48b85 Merge "Fix sound effect attenuation calculation" 2012-07-10 16:33:37 -07:00
Stephen Hines
ec6f200cd8 Fix RS matrix docs regarding row/column and x/y. 
Change-Id: Ibcb90ee62e458adfa55849fc1bc79257293975fe
 2012-07-10 16:25:07 -07:00
Jason Sams
603b2d0731 Merge "Cleanup filter preview test." 2012-07-10 15:51:40 -07:00
Craig Mautner
105b78bb31 Add missing interface method. 
Fix broken build.

Change-Id: I6644df218e11a35330a985bdcb9ace33723330f5
 2012-07-10 15:17:25 -07:00
Teng-Hui Zhu
156f97b6c8 Release the media player when trimming memory 
Change-Id: I2bb2880546311761fc38d6208de080a66216fa2f
 2012-07-10 15:11:38 -07:00
Craig Mautner
fbf885b652 Merge "Notify client side of window movement." 2012-07-10 14:48:06 -07:00
Katie McCormick
db30781663 am 585228d3: am 2a17520f: Merge "Doc update: GCM doc cleanup." into jb-dev 
* commit '585228d33b60b8d04fdc34995a26fefddce5e9bb':
  Doc update: GCM doc cleanup.
 2012-07-10 14:32:37 -07:00
Fabrice Di Meglio
8e136f85f7 Fix for bug 6716343. Use correct offset for mPos reset. DO NOT MERGE 
The mPos field in the MeasuredText object is relative to the start of
the text (mTextStart), but the pos passed in by the caller of the
setPos() method is relative to the character sequence. When spans
overlap break boundaries and the paragraph doesn't start at 0, the
result is an out of bounds error. This fix uses the correct offset.

Change-Id: I64ef06df0eb06f75aedd25de97e9f347eeb52979
 2012-07-10 14:30:45 -07:00
Katie McCormick
585228d33b am 2a17520f: Merge "Doc update: GCM doc cleanup." into jb-dev 
* commit '2a17520fbaf2ca38c04702bacfe443d7a24b4b91':
  Doc update: GCM doc cleanup.
 2012-07-10 14:30:15 -07:00
Katie McCormick
2a17520fba Merge "Doc update: GCM doc cleanup." into jb-dev 2012-07-10 14:27:42 -07:00
Jason Sams
702fb2c502 Cleanup filter preview test. 
Change-Id: I626a1261affb86499ec398678523b0fe9e5fe679
 2012-07-10 14:18:45 -07:00
Craig Mautner
ce99e79244 Merge "Handle keyguard visibility states separately." 2012-07-10 14:15:53 -07:00
Craig Mautner
4bf18a7c97 Handle keyguard visibility states separately. 
Previous to this change the forceHiding variable was a boolean. This
change recognizes the different configurations of the keyguard by
defining separate states for forceHiding and testing for window
visibility differently in each state.

Fixes bug 6786114.

Change-Id: I078e0df7865ddafe498ee46e02110c3a017386d0
 2012-07-10 14:08:16 -07:00
Katie McCormick
7cd6dcd2f8 Doc update: GCM doc cleanup. 
Change-Id: Ie84a6ebdd12a05c8dbe1fff97539aea90c93554c
 2012-07-10 14:07:08 -07:00
Romain Guy
717b81ff3e am 6d2999a0: am 90752485: Properly resize paletted bitmaps when adjusting for density 
* commit '6d2999a048332c6192e66ec67835a71d59282384':
  Properly resize paletted bitmaps when adjusting for density
 2012-07-10 13:29:20 -07:00
Romain Guy
6d2999a048 am 90752485: Properly resize paletted bitmaps when adjusting for density 
* commit '907524851af0d656ba049311f7535a4ba5d2b1d2':
  Properly resize paletted bitmaps when adjusting for density
 2012-07-10 13:26:49 -07:00
Jean-Michel Trivi
f2b0c11f4e Fix sound effect attenuation calculation 
The sound effect volume attenuation calculation is wrong: the
 division by 20 was always returning 1 or 0.
In AudioService, rename the sound effect attenuation value to
 follow the naming conventions for static variables.

Change-Id: I3c36d50f4470ff09ca98cb944aefb5ad0f968782
 2012-07-10 13:24:23 -07:00
Romain Guy
907524851a Properly resize paletted bitmaps when adjusting for density 
If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

This issue affects third party applications, here is the external bug
report:

http://code.google.com/p/android/issues/detail?id=34619

DO NOT MERGE

Change-Id: I7f99b28ad6e6c28bdbcb29bbbadcb215268ff710
 2012-07-10 13:16:46 -07:00
Xavier Ducrohet
54a18ef7ad Replace LruCache implementation for layoutlib. do not merge. 
The android version depends on a custom version of LinkedHashMap
which is not present on desktop VMs. This new implementation is done
in a way that minimizes the difference between the two.

Also some minor fixes.

(cherry picked from commit 01b6c755dbcf24e71192dc44757e2eea2a426091)

Change-Id: Idc7bca820e472e281a3024a5b610fd55606cf428
 2012-07-10 12:51:30 -07:00
Xavier Ducrohet
70d0c1532f Merge "Replace LruCache implementation for layoutlib." 2012-07-10 12:39:17 -07:00
Ying Wang
34d62d1b97 am b8c5df85: (-s ours) am 40a4ab13: Import translations. DO NOT MERGE 
* commit 'b8c5df85622155196d5d961f7674547947f5fc08':
  Import translations. DO NOT MERGE
 2012-07-10 12:38:46 -07:00
Ying Wang
b8c5df8562 am 40a4ab13: Import translations. DO NOT MERGE 
* commit '40a4ab130a3e3c99afb1a57e9aa30de03a89b51e':
  Import translations. DO NOT MERGE
 2012-07-10 12:36:11 -07:00