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

74073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
fda531c9e4 Merge "Disable AA lines vertex attrib arrays after rendering" 2012-04-04 11:53:28 -07:00
Romain Guy
7b63142d2f Disable AA lines vertex attrib arrays after rendering 
Change-Id: I2f035e9d87f4f97bc1e37355c84570fd58df0374
 2012-04-04 11:38:54 -07:00
Martijn Coenen
30bd284cca Merge "Add API for querying extended length APDU support." 2012-04-04 11:19:08 -07:00
Martijn Coenen
1899b73110 Merge "Document "disable default Beam" meta-data entry." 2012-04-04 11:12:52 -07:00
Roman Nurik
970abd9b04 am 6644efe6: am 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 
* commit '6644efe63c86d25ecaf54d88cf15336f53baa369':
 2012-04-04 11:05:40 -07:00
Roman Nurik
63e29b0de0 am b328cc3e: am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 
* commit 'b328cc3e813f38917860aff3b85e045de835856c':
  docs: Android Design: v3 update (settings, navigation)
 2012-04-04 11:02:37 -07:00
Roman Nurik
6644efe63c am 7dc67f51: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 
* commit '7dc67f51272de42112d51a912c352ff2dc3aaf9c':
 2012-04-04 11:01:27 -07:00
Roman Nurik
b328cc3e81 am 32a035d1: am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 
* commit '32a035d165f43b72d961a71192c902eba581dd0e':
  docs: Android Design: v3 update (settings, navigation)
 2012-04-04 10:58:53 -07:00
Roman Nurik
7dc67f5127 am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 
* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)
 2012-04-04 10:57:24 -07:00
Roman Nurik
32a035d165 am fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 
* commit 'fa840e2b9f7e8b5655fa262cd063800188dec216':
  docs: Android Design: v3 update (settings, navigation)
 2012-04-04 10:55:55 -07:00
Roman Nurik
fa840e2b9f Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1 2012-04-04 10:53:58 -07:00
Martijn Coenen
854e077555 Document "disable default Beam" meta-data entry. 
Change-Id: Icaa767ee37fcca08b1ff5143eb94cf8e66be840c
 2012-04-04 10:48:04 -07:00
Martijn Coenen
fa98cf0573 Add API for querying extended length APDU support. 
Bug: 5813943
Change-Id: Iffb415f318e095bde9ed6677b22613d210f8a39c
 2012-04-04 10:43:06 -07:00
Chet Haase
5e63d99ca5 Merge "Enhanced frame profiling from gfxinfo" 2012-04-04 10:39:33 -07:00
Roman Nurik
b20f1201fd docs: Android Design: v3 update (settings, navigation) 
Change-Id: I351e82561432f4357b52d2b7d99ae0fafdf79688
 2012-04-04 10:31:11 -07:00
Gilles Debunne
935a15ebed Merge "Removed spurious log about blinking cursor" 2012-04-04 10:14:13 -07:00
Gilles Debunne
cfbf0e0296 Removed spurious log about blinking cursor 
Change-Id: I940c3847bb6e461178575480c82e7dd6739277cf
 2012-04-04 10:12:05 -07:00
Stephen Hines
cf15200ddb Merge "Revert "Build /system/bin/asan/app_process."" 2012-04-04 08:12:56 -07:00
Stephen Hines
5bb508fac6 Revert "Build /system/bin/asan/app_process." 
This reverts commit cb5c734790e1e3d8496b4c75c57e8a537784c056
 2012-04-04 08:12:46 -07:00
Stephen Hines
78b3825009 Merge "Build /system/bin/asan/app_process." 2012-04-04 08:03:21 -07:00
Chet Haase
09280606dc Enhanced frame profiling from gfxinfo 
You can now set the max number of frames being tracked by the gfxinfo
profiling data by doing 'adb shell setprop hwui.profil.maxframes #'.
Also, running gfxinfo automatically resets the data so that any set of
frame data always starts from the beginning.

Change-Id: I87ae3fb4d580741a1b2fba75be4ec540de7c52a4
 2012-04-04 07:49:06 -07:00
Michael Jurka
16ad29d508 Merge "Fix bugs with popup menu in Recent Applications" 2012-04-04 01:55:00 -07:00
Michael Jurka
e16c93a5a3 Merge "Reducing height of scroll fade in Recents on phone" 2012-04-04 01:54:40 -07:00
Romain Guy
0a1cbc5f7d Merge "New libhwui test activity" 2012-04-03 21:17:34 -07:00
Jeff Sharkey
4dfdf4d629 Merge "Hide Preference title when empty." 2012-04-03 21:15:34 -07:00
Romain Guy
2946445b56 New libhwui test activity 
Change-Id: I0ce4bc665f117d7c0ed47670ceb4ed6f9b54d85c
 2012-04-03 21:15:12 -07:00
Jeff Sharkey
0f1c3af76b Hide Preference title when empty. 
Change-Id: I1c1d73f5a4647657c7da65c72192fbac061fe259
 2012-04-03 20:46:42 -07:00
Romain Guy
8c8c240092 Merge "Optimize FBOs composition" 2012-04-03 19:33:06 -07:00
Romain Guy
e0aa84b7dc Optimize FBOs composition 
Change-Id: Ifc8eada8922509373c0e4c3b2ed75b6f08d098de
 2012-04-03 19:30:26 -07:00
Jason Noguchi
af92c532e7 am f499a072: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit 'f499a0722b329fd8954c43cb39ab6fbba23cfee4':
 2012-04-03 18:11:27 -07:00
Megha Joshi
7c19d4b910 am 24748143: am 43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1 
* commit '24748143afd155c14661031bcdacf28c890403a2':
 2012-04-03 18:11:25 -07:00
Jason Noguchi
d05907cb3e am e371ed8d: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 
* commit 'e371ed8de54c42d2e0b8aa3fb7196670ff5ae9ee':
 2012-04-03 18:11:24 -07:00
Scott Main
4436170460 am fcdf5217: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1 
* commit 'fcdf5217e0b43d119af0da30ff0066317154819d':
 2012-04-03 18:11:21 -07:00
Fred Chung
68911d4b9d am 33c99ba6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1 
* commit '33c99ba6978126d6ec57c83a91772f5a531851ec':
 2012-04-03 18:11:19 -07:00
Jason Noguchi
874d02f67c am 54cfceb6: am 4a219e6b: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit '54cfceb6ca4035d7cb0f83649b50bbc41e02d406':
 2012-04-03 17:40:21 -07:00
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
54cfceb6ca am 4a219e6b: am a784b3de: Fix build break introduced by missing parenthesis in camera stress test. 
* commit '4a219e6b3c860050691bfc53e300a984c894fda5':
 2012-04-03 17:35:14 -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
f499a0722b 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:30:55 -07:00
Jason Noguchi
4a219e6b3c 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:30:49 -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