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

81630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Tafertshofer
17045a1657 Updated OpenGL bindings to fix nio buffer crash 
Contains the updated OpenGL bindings generated by glgen.
Fixes a bug with methods that have more then one nio buffer argument.

Bug: 6772416
Change-Id: I6d50ce79669edd43dbe414e499660cdd55eb4893
 2012-07-12 13:55:55 -07:00
Mathias Agopian
f16336790b Merge "Fixed exception caused crash in GL bindings" 2012-07-11 16:08:25 -07:00
Mathias Agopian
73a3c0c4d7 Merge "EGL 1.4 bindings generated by glgen" 2012-07-11 16:08:18 -07:00
Joe Fernandez
4accd54f01 am 204a1022: am 82c81550: Merge "docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates" into jb-dev 
* commit '204a1022220b92afb9a383df75c036c556714742':
  docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates
 2012-07-11 15:56:45 -07:00
Joe Fernandez
204a102222 am 82c81550: Merge "docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates" into jb-dev 
* commit '82c815500e7d73befd85df4ceca04ae00814d9c1':
  docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates
 2012-07-11 15:53:35 -07:00
Joe Fernandez
82c815500e Merge "docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates" into jb-dev 2012-07-11 15:50:35 -07:00
Joe Fernandez
d2d6c09a85 docs: ADK 2012 IDE for Windows download link update, plus minor content fixes/updates 
Change-Id: I53fed5504b6d77185dc9715afcd3bdf0bc9182a8
 2012-07-11 15:26:09 -07:00
Craig Mautner
779a33b779 am 64ab8fcd: (-s ours) am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev 
* commit '64ab8fcd6f2011c0d185f2973b9615f155f6d239':
  Handle keyguard visibility states separately. DO NOT MERGE
 2012-07-11 15:21:39 -07:00
Craig Mautner
64ab8fcd6f am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev 
* commit 'dcddea95301641e3dc9692ed7d70127085458a24':
  Handle keyguard visibility states separately. DO NOT MERGE
 2012-07-11 15:18:14 -07:00
Craig Mautner
dcddea9530 Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev 2012-07-11 15:15:00 -07:00
Craig Mautner
f333f5f67a Handle keyguard visibility states separately. DO NOT MERGE 
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: I3460c45ea6da772a4ff76bb016de7aa4b051a673
 2012-07-11 14:38:29 -07:00
Wink Saville
9b3465792c Add a blank line to MockRilTest.java 
Create a merge conflict on the first change to be submitted for moving
telephony and mms from frameworks/base to frameworks/opt. I'm doing this
by adding a blank line to a file in master that will be deleted in
frameworks/base in jb-dev-plus-aosp.

We can then manually merge all of the changes across the projects and
minimize the time master might be broken.

Change-Id: Ie55db5037dbfd20ea6b4be430f65b93250203a63
 2012-07-11 14:35:25 -07:00
Katie McCormick
b34378a799 am 7e767448: am d5cd8904: Merge "Doc change: New TTL error code." into jb-dev 
* commit '7e7674489f75003b3f33244345c48f755fef88f1':
  Doc change: New TTL error code.
 2012-07-11 14:18:29 -07:00
Katie McCormick
7e7674489f am d5cd8904: Merge "Doc change: New TTL error code." into jb-dev 
* commit 'd5cd89049b801e669960890863f1fa7f4a6e61d9':
  Doc change: New TTL error code.
 2012-07-11 14:15:12 -07:00
Katie McCormick
d5cd89049b Merge "Doc change: New TTL error code." into jb-dev 2012-07-11 14:12:13 -07:00
Ying Wang
75d928a1c0 am 0ddea75b: (-s ours) am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '0ddea75be44df61b4bde5d69340e071b39e54417':
  Import translations. DO NOT MERGE
 2012-07-11 14:00:50 -07:00
Ying Wang
0ddea75be4 am 04ca8e57: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '04ca8e577859235a68fa9a5268af528d547310be':
  Import translations. DO NOT MERGE
 2012-07-11 13:57:43 -07:00
Ying Wang
40cbdd2ae6 Merge "Import translations. DO NOT MERGE" 2012-07-11 13:55:46 -07:00
Ying Wang
04ca8e5778 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-07-11 13:55:33 -07:00
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
Ying Wang
b16d4294d0 Import translations. DO NOT MERGE 
Change-Id: I2a0c62b421d1a080549c2cbedc1a14c3afaf60f3
Auto-generated-cl: translation import
 2012-07-11 12:58:16 -07:00
Ying Wang
2ba281577a Import translations. DO NOT MERGE 
Change-Id: Idabf12464d73bf707daf0f870de2349731b574e2
Auto-generated-cl: translation import
 2012-07-11 12:51:31 -07:00
Victoria Lease
cae28fa051 Merge "Remove hardcoded typeface pointers" 2012-07-11 12:49:12 -07:00
Katie McCormick
507c3129eb Doc change: New TTL error code. 
Change-Id: I99844d28243e0d6592219f532db08855d73f338e
 2012-07-11 10:25:13 -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