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

65086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
33680ff630 Adding ability to bind constants to shaders. 
Change-Id: I63b664fd2fec7e0c8157b7185782192132222f1a
 2012-01-10 10:16:52 -08:00
Alex Sakhartchouk
dd1da45115 Adding shader parameter linking. 
Change-Id: Ia5f0b6b7e935102bc2d5055875faeec209ae2b41
 2012-01-10 09:28:16 -08:00
Alex Sakhartchouk
d5a62bb802 Adding getters to rs program obejcts. 
Change-Id: Iff8ccc1835109d303201d6a1adb6e5cbde8ba634
 2012-01-06 10:36:06 -08:00
Alex Sakhartchouk
95853e4e2b Merge "Cleanup based on comments." into graphics-dev 2012-01-06 09:41:52 -08:00
Marco Nelissen
68c019e4c2 am 18c6afa0: Merge "Also accept non-parenthesized genre numbers" 
* commit '18c6afa0c57074e08b8856dde306d3302834b1a9':
  Also accept non-parenthesized genre numbers
 2012-01-06 08:09:54 -08:00
Marco Nelissen
18c6afa0c5 Merge "Also accept non-parenthesized genre numbers" 2012-01-06 08:08:15 -08:00
Jonathan Dixon
017ad7cd56 am 5883520f: Merge "Make WebView.HitTestResult static" 
* commit '5883520fd7c9b3426d0fcc107f647f999a0a3232':
  Make WebView.HitTestResult static
 2012-01-06 02:22:36 -08:00
Jonathan Dixon
5883520fd7 Merge "Make WebView.HitTestResult static" 2012-01-06 02:19:31 -08:00
Ken Wakasa
0b34fb7d32 am c42e6a0b: Merge "Comment clean up for InputMethodSubtype." 
* commit 'c42e6a0bed2c88fd03466c5104d62d7f98e68768':
  Comment clean up for InputMethodSubtype.
 2012-01-05 19:47:06 -08:00
Ken Wakasa
c42e6a0bed Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
3e27e56a8f am 3dc5a2ea: Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 
* commit '3dc5a2eacfc6125e5299d42ac3ed64ec9e70d0fa':
  Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366
 2012-01-05 19:43:51 -08:00
Rajdeep Dua
3dc5a2eacf Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Ken Wakasa
9a74476c0a Comment clean up for InputMethodSubtype. 
Change-Id: I50bca715f4caa669cb341b36a3d46358e1ad1ded
 2012-01-06 12:32:15 +09:00
Fabrice Di Meglio
03b17a2df5 am d4a69b4a: Merge "Fix bug #5753006 Garbled Labels in Maps" 
* commit 'd4a69b4a1cb5b52035345abd8cb9595ae4cf9fa5':
  Fix bug #5753006 Garbled Labels in Maps
 2012-01-05 15:21:28 -08:00
Fabrice Di Meglio
d4a69b4a1c Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Marco Nelissen
ad35f9165e Also accept non-parenthesized genre numbers 
b/5790684

Change-Id: Ia13feebeaadd45d9196486c012538c5b80840163
 2012-01-05 15:15:53 -08:00
Alex Sakhartchouk
61cd943514 Cleanup based on comments. 
Change-Id: I2d261b3cd240b890001dcc7d2a849cfdc34328bf
 2012-01-05 14:55:11 -08:00
Teng-Hui Zhu
ebb9423e89 am a4ad2928: Merge "getDuration can be only called after prepared." 
* commit 'a4ad2928eb47974e922191dd008dfa98e3711ca0':
  getDuration can be only called after prepared.
 2012-01-05 14:50:19 -08:00
Teng-Hui Zhu
a4ad2928eb Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
David Hu
d0c2d4f21e am 0df0ed58: Merge "BandwidthTestRunner" 
* commit '0df0ed5814a83c4cf0dd3d6d6e177f5ed9003863':
  BandwidthTestRunner
 2012-01-05 14:41:47 -08:00
David Hu
0df0ed5814 Merge "BandwidthTestRunner" 2012-01-05 14:39:45 -08:00
Marco Nelissen
7d41481c07 am 4b4d00e7: Merge "ThumbnailUtils: To fix misuse of FileInputStream." 
* commit '4b4d00e7149f11c84614d8cc98ae7bff21dbd960':
  ThumbnailUtils: To fix misuse of FileInputStream.
 2012-01-05 14:15:41 -08:00
Marco Nelissen
4b4d00e714 Merge "ThumbnailUtils: To fix misuse of FileInputStream." 2012-01-05 14:11:40 -08:00
Steve Block
2893338442 am bd47cac4: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 
* commit 'bd47cac4dfc8440a848b33107cba1d6773f3e124':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE
 2012-01-05 14:09:25 -08:00
Steve Block
bd47cac4df Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
34e86f3260 am c726ff02: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long" 
* commit 'c726ff02c7749f134885decadd2ea86877119c3d':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long
 2012-01-05 13:57:41 -08:00
Fabrice Di Meglio
c726ff02c7 Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long" 2012-01-05 13:55:01 -08:00
Fabrice Di Meglio
c511bee87c Fix bug #5753006 Garbled Labels in Maps 
- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class

Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
 2012-01-05 13:30:54 -08:00
Scott Main
5c48202bb8 am d1a82292: am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit 'd1a8229227f1e8b81a927ef694257dfe0707c985':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 12:13:25 -08:00
The Android Open Source Project
fd552368c4 am b1483cb9: am d32ee5ba: Reconcile with ics-mr1-release 
* commit 'b1483cb9ca4291791ab6b58cf7b8c5cfea179132':
 2012-01-05 12:13:22 -08:00
Scott Main
d1a8229227 am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit '47228cac900cd58d0687b6e6d980381cfc8010a1':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 12:09:07 -08:00
The Android Open Source Project
b1483cb9ca am d32ee5ba: Reconcile with ics-mr1-release 
* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
 2012-01-05 12:08:48 -08:00
Robert Greenwalt
1ab208a96e am 32350c7a: Merge "Filter our v6 address from tethering dns." 
* commit '32350c7ab2f56b6d70437ba62f85232fd0b2c24a':
  Filter our v6 address from tethering dns.
 2012-01-05 11:41:16 -08:00
Robert Greenwalt
32350c7ab2 Merge "Filter our v6 address from tethering dns." 2012-01-05 11:39:26 -08:00
Scott Main
47228cac90 am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:45:19 -08:00
Scott Main
dacbf67ab9 Merge changes I1df85b6a,I7c6a68b6 into ics-mr1 
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
 2012-01-05 09:42:52 -08:00
Alex Sakhartchouk
e079590fea Merge "Adding light script to scenegraph. Patching up the collada parser to handle data from different converters." into graphics-dev 2012-01-05 09:29:41 -08:00
Glenn Kasten
910f262f72 am 6b14d585: Merge "Remove the notion of "active track" from mixer" 
* commit '6b14d5858056d49d2cd2162cd043908794e5a4df':
  Remove the notion of "active track" from mixer
 2012-01-05 08:21:37 -08:00
Glenn Kasten
6b14d58580 Merge "Remove the notion of "active track" from mixer" 2012-01-05 08:20:10 -08:00
The Android Open Source Project
d32ee5baa0 Reconcile with ics-mr1-release 
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
 2012-01-05 07:45:28 -08:00
Glenn Kasten
6b6e640323 am a8719ad9: Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 
* commit 'a8719ad9d53d3fe51e8031b2471e9558b8ef727f':
  Use the standard CC_LIKELY and CC_UNLIKELY macros
 2012-01-05 07:40:36 -08:00
Glenn Kasten
a8719ad9d5 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
e80a4ccd2b Use the standard CC_LIKELY and CC_UNLIKELY macros 
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
 2012-01-05 07:33:45 -08:00
Rajdeep Dua
cf06d7390c Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) 
Bug Id : 5813366

Change-Id: Icc482ad820a91a1896c61db67bb6b95cc2ae4c5b
 2012-01-05 16:27:15 +05:30
Dongwon Kang
3993818689 ThumbnailUtils: To fix misuse of FileInputStream. 
We need to close it explicitly after using it. Without this, fd will be closed
non-deterministically, and that will break the decode procedure.

Bug: 5808889
Change-Id: Icf9ff9abd6e327b122c6916df9750016b3d1b616
 2012-01-05 17:17:48 +09:00
Wink Saville
e5221a5b9b am 9a03482c: am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit '9a03482c66b2f5c30c7fde38216239a1f233df02':
  Enhancement on ICS data stall polling logic
 2012-01-04 21:55:03 -08:00
Wink Saville
dbce639d7c am efd617e0: am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1 
* commit 'efd617e01f8c22a69fa6d458883933f059e43491':
  Add support of dislaying Alpha tag for BIP commands
 2012-01-04 21:55:00 -08:00
Wink Saville
e824658af5 am 7da207b5: am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 
* commit '7da207b574f1281792dcd7022467180d24438315':
  Support suggestedRetryTime in CDMA DCT
 2012-01-04 21:54:57 -08:00
Bart Sears
fd0278939e am 39f05540: am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 
* commit '39f05540988775fa44c5ca6a535bf329889b8720':
  Do not allow file:// access when it is disabled. Do not merge.
 2012-01-04 21:54:55 -08:00
Wink Saville
9a03482c66 am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1 
* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
  Enhancement on ICS data stall polling logic
 2012-01-04 21:52:13 -08:00