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

74028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Noguchi
c0c4a20c0f am a72a06f3: am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'a72a06f37ecdd615fb2a29faed99c7f128196211':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:37:10 -07:00
Jason Noguchi
a72a06f37e am f5693a6a: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'f5693a6a50d2806ef5a4fd30929539e941dfa069':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:33:57 -07:00
Jason Noguchi
f5693a6a50 am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'a784b3dea15dd0dfedfe25552b87fbb92a5eea52':
  Fix build break introduced by missing parenthesis in camera stress test.
 2012-04-03 17:31:00 -07:00
Jason Noguchi
a784b3dea1 Fix build break introduced by missing parenthesis in camera stress test. 
Change-Id: I8da9321a7674dbbe48cc0c214c0b043fbce8eeab
 2012-04-03 17:01:50 -07:00
Megha Joshi
f91dcb6ec5 am be6c2c48: am 9cb941d5: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit 'be6c2c48f3d9b848eb4f94173f6851a589cc8fcd':
 2012-04-03 16:32:51 -07:00
Jason Noguchi
59e6ddb8ed am bfdb5bbd: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'bfdb5bbdca0cdcb1c205846860d4916b65bdc2e2':
 2012-04-03 16:32:49 -07:00
Jason Noguchi
11204854bb am 9c0fe75c: am 9e88e82e: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '9c0fe75c392936327edf9fb449b13ad130b6140a':
 2012-04-03 16:32:47 -07:00
Scott Main
816e24dd90 am 09d1442b: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '09d1442bf6fbdeb271db3dfa5709889d5e4c6627':
 2012-04-03 16:32:45 -07:00
Scott Main
b6de419763 am 793553b4: am ac15e96e: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '793553b4f09213cdf8b580318f4a9c0b1f4dc0fa':
 2012-04-03 16:32:44 -07:00
Megha Joshi
df322d408c am 306d1180: am 5a894a35: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit '306d1180fda2e471eb27310e9753d87e1bebf1ca':
  Creating new "Optimizing for TV" training.
 2012-04-03 16:32:42 -07:00
Jason Noguchi
b7cc80d8f3 am a5408a8c: am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit 'a5408a8c75a2839f1b0704f024cc4e523830c128':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 16:32:40 -07:00
Fabrice Di Meglio
6756f74d81 Fix the build 
- was missing another pass to update-api

Change-Id: Idd7e8364d475b41d0f517b6a06c4a79f31997ff2
 2012-04-03 16:24:33 -07:00
Megha Joshi
be6c2c48f3 am 9cb941d5: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit '9cb941d591ccc26f10846866112371572164410d':
 2012-04-03 16:15:35 -07:00
Jason Noguchi
bfdb5bbdca Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-03 16:15:34 -07:00
Megha Joshi
306d1180fd am 5a894a35: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit '5a894a35cc822aa1d12fd824815f91664c1237dd':
  Creating new "Optimizing for TV" training.
 2012-04-03 16:13:16 -07:00
Megha Joshi
9cb941d591 am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit '43562ecf434092308765e2c31377c46612ba61bb':
  Creating new "Optimizing for TV" training.
 2012-04-03 16:10:56 -07:00
Megha Joshi
5a894a35cc am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit '43562ecf434092308765e2c31377c46612ba61bb':
  Creating new "Optimizing for TV" training.
 2012-04-03 16:10:28 -07:00
Megha Joshi
43562ecf43 Merge "Creating new "Optimizing for TV" training." into ics-mr1 2012-04-03 16:08:29 -07:00
Megha Joshi
931ff55a90 Creating new "Optimizing for TV" training. 
Change-Id: Id2f35e07460f4c900facd364631a09c369b45310
 2012-04-03 15:59:02 -07:00
Jason Sams
256b154f6a Merge "Validate context when using RS objects." 2012-04-03 15:53:39 -07:00
Chet Haase
21aec19d30 Merge "Optimization of alpha with DisplayList properties" 2012-04-03 15:40:54 -07:00
Mathias Agopian
66ac90276a Merge "usea socketpair instead of a pipe in BitTube" 2012-04-03 15:38:14 -07:00
Jason Noguchi
9c0fe75c39 am 9e88e82e: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '9e88e82e9ba2938263212f63c5021a904740a690':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:37:15 -07:00
Scott Main
09d1442bf6 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-03 15:37:14 -07:00
Jason Sams
e07694b24f Validate context when using RS objects. 
BUG=6035422

Change-Id: I8586be0085b36767289e1f634111c0ff076cec3c
 2012-04-03 15:36:36 -07:00
Jason Noguchi
a5408a8c75 am 34a4e519: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '34a4e519b298941760c1d6797142a9ebca003627':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:36:32 -07:00
Jason Noguchi
9e88e82e9b am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:32:47 -07:00
Jason Noguchi
34a4e519b2 am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit '6e6d8df5d0ad0f97be8344c78aa4d70dadceb9a8':
  Adding camera zoom test to mediaframework stress suite.
 2012-04-03 15:32:34 -07:00
Chris Craik
e252077d25 am 0f9e4bc5: am ad5789c6: am c70e89e2: Fix hybrid build 
* commit '0f9e4bc54411c7e1c1f08299282a8bd0cd9b8d34':
  Fix hybrid build
 2012-04-03 15:31:40 -07:00
Jason Noguchi
6e6d8df5d0 Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 2012-04-03 15:30:22 -07:00
Chris Craik
0f9e4bc544 am ad5789c6: am c70e89e2: Fix hybrid build 
* commit 'ad5789c6dcad930f1fce34685b7ca84df4d68e90':
  Fix hybrid build
 2012-04-03 15:28:22 -07:00
Jim Miller
1533a87eef Merge "Fix 6247249: make sure label on tablets is "done" instead of "next"" 2012-04-03 15:24:51 -07:00
Chris Craik
ad5789c6dc am c70e89e2: Fix hybrid build 
* commit 'c70e89e2a024645d425b49db2bbf3f20ed68e518':
  Fix hybrid build
 2012-04-03 15:24:37 -07:00
Fabrice Di Meglio
fde3f83cd2 Merge "Fix bug #6140391 Make RTL awareness as an opt-in into the AndroidManifest" 2012-04-03 14:45:53 -07:00
Chris Craik
c70e89e2a0 Fix hybrid build 
Change-Id: Ieef556473e1878d1319f9844fb0bbb974637999e
 2012-04-03 14:44:38 -07:00
Andreas Huber
991c8733c3 Merge "More DRM/crypto support." 2012-04-03 14:27:35 -07:00
Andreas Huber
0e97fc248e More DRM/crypto support. 
related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
 2012-04-03 14:16:07 -07:00
Scott Main
b52d99e188 am 8167faa0: am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '8167faa029485acc3245991d492ef951eb655399':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:07:08 -07:00
Scott Main
793553b4f0 am ac15e96e: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit 'ac15e96e49db31d80a8c11c1236d2d5fe3ba429e':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:03:39 -07:00
Scott Main
8167faa029 am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '2449b2eb84f75e0bee366f9646d0863daa966b83':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:03:32 -07:00
Chet Haase
db8c9a6a4d Optimization of alpha with DisplayList properties 
Some views (such as ImageView and TextView) handle non-opaque alpha
values directly. This was originally an optimization, but we can handle it faster
in many cases without this optimization when DisplayList properties are enabled.
Basically, if a view has non-overlapping rendering, we set the alpha value directly
on the renderer (the equivalent of setting it on the Paint object) and draw each
primitive with that alpha value. Doing it this way avoids re-creating DisplayLists
while getting the same speedup that onSetAlpha() used to get pre-DisplayList properties.

Change-Id: I0f7827f075d3b35093a882d4adbb300a1063c288
 2012-04-03 14:02:17 -07:00
Daisuke Miyakawa
fd007cb576 Merge "Shorten PRESSED_STATE_DURATION" 2012-04-03 14:00:58 -07:00
Scott Main
2449b2eb84 am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '0687c83032219656fa4ff64ca28dd28fd15ca748':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 14:00:17 -07:00
Scott Main
ac15e96e49 am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit '0687c83032219656fa4ff64ca28dd28fd15ca748':
  docs: change markup for "new" tags to avoid the new tags wraping solo
 2012-04-03 13:59:46 -07:00
Scott Main
0687c83032 Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 2012-04-03 13:58:16 -07:00
Russell Brenner
dedf1b2727 Merge "Add Japanese to fallback fonts" 2012-04-03 13:33:22 -07:00
Fred Chung
60e2487a6e am ce151065: am 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit 'ce15106585b4d347cedca0b9a8f4b06fc58fcb0b':
 2012-04-03 13:27:12 -07:00
Scott Main
7970558e75 docs: change markup for "new" tags to avoid the new tags wraping solo 
Change-Id: If88d3cc173080db101ea5af9dc728653a2176a46
 2012-04-03 13:25:47 -07:00
Fred Chung
8ceaac0975 am 59616aa6: am 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '59616aa6e652b8d54df93567101e3b455f2d94a8':
  Android Training: Making Your App Location Aware
 2012-04-03 13:24:15 -07:00
Fred Chung
ce15106585 am 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '0249e6c4f9083206c1ab280dfa149a65bf931b7e':
 2012-04-03 13:23:29 -07:00