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

62865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
8f04ae361c docs: fix sidenav typo 
Change-Id: Ief250d461294ed99963cc8e9aa24c9f271e72b15
 2011-12-18 14:00:41 -08:00
Scott Main
a2086cfc12 am df440164: docs: add driver info for Hisense 
* commit 'df440164ba09bcce8b409bb5a2d4a4ef8f704148':
  docs: add driver info for Hisense
 2011-12-16 12:56:33 -08:00
Scott Main
df440164ba docs: add driver info for Hisense 
Change-Id: I95c09e7aa905345113112329c98d5f00e145b2bb
 2011-12-16 12:52:58 -08:00
Roman Nurik
8cffc31810 am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class 
* commit 'a8001e2ae908c413b626a82f5ab925f18559509c':
  docs: Add missing intent flag to Android U nav class
 2011-12-16 12:07:27 -08:00
Roman Nurik
a8001e2ae9 am 00697a90: docs: Add missing intent flag to Android U nav class 
* commit '00697a90bec4e0536cfa0873602b64bb6785022e':
  docs: Add missing intent flag to Android U nav class
 2011-12-16 12:05:32 -08:00
The Android Automerger
bf35112b28 merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:35 -08:00
Justin Ho
9edb26ea55 am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 
* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
 2011-12-16 11:54:01 -08:00
Justin Ho
043c5f8f1d Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 2011-12-16 11:52:08 -08:00
Roman Nurik
00697a90be docs: Add missing intent flag to Android U nav class 
Change-Id: I18eb286a8d8b2c70f7d894d1244d2568ce6ce6c0
 2011-12-16 11:48:24 -08:00
Alexander Lucas
f5ed1d4c55 am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1 
* commit '6469ee8016d1e02673e05356b2590d3175dcd062':
  Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
 2011-12-16 11:39:40 -08:00
Alexander Lucas
6469ee8016 Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1 2011-12-16 11:38:05 -08:00
Scott Main
5e7bed0b2a am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1 
* commit '0f52d7666e83a7aa1979d65820ece865c7e1fd08':
  docs: fix whitespace in sidenav
 2011-12-16 11:32:24 -08:00
Scott Main
0f52d7666e Merge "docs: fix whitespace in sidenav" into ics-mr1 2011-12-16 11:30:00 -08:00
Scott Main
edceed2359 docs: fix whitespace in sidenav 
Change-Id: I7d8decaf122de1f632fdbd3ca5a1a34b3d1d91dd
 2011-12-16 11:29:12 -08:00
Roman Nurik
1410f8a2a5 am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0 
* commit '795c271f448704561cd1312dd51826dca82f392f':
  docs: Minor link fix in Android U class
 2011-12-16 11:25:02 -08:00
Roman Nurik
795c271f44 am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0 
* commit 'eb946fbdc800d56e1cbac515a1c73de806e74711':
  docs: Minor link fix in Android U class
 2011-12-16 11:23:27 -08:00
Roman Nurik
eb946fbdc8 Merge "docs: Minor link fix in Android U class" into ics-mr0 2011-12-16 11:21:59 -08:00
Bill Gruber
590ba7a4f0 am e2a95b59: am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0 
* commit 'e2a95b59f554d1d60b7e6c27d870158ec7051e31':
  Dev guide for sensors
 2011-12-16 11:15:46 -08:00
Roman Nurik
6b21fa8b72 docs: Minor link fix in Android U class 
Change-Id: Ifab9c8088ba686a560647883cbacdd34c1c08c80
 2011-12-16 11:15:13 -08:00
Bill Gruber
e2a95b59f5 am 97aafdf4: Merge "Dev guide for sensors" into ics-mr0 
* commit '97aafdf46e5007fa7b3f6eae4e54d692877ad824':
  Dev guide for sensors
 2011-12-16 11:13:13 -08:00
Bill Gruber
97aafdf46e Merge "Dev guide for sensors" into ics-mr0 2011-12-16 11:11:46 -08:00
Alexander Lucas
9c093132da Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson 
Change-Id: I05c100d583340456eed8d15d555e1f02a38504a8
 2011-12-16 11:03:18 -08:00
Dirk Dougherty
41a7998df7 am 8c65ab81: Merge "Updated "Designing for Security" documentation" into ics-mr1 
* commit '8c65ab81e84f36c311d2ae6831819a5caa404548':
  Updated "Designing for Security" documentation
 2011-12-16 10:58:42 -08:00
Dirk Dougherty
8c65ab81e8 Merge "Updated "Designing for Security" documentation" into ics-mr1 2011-12-16 10:56:29 -08:00
Adrian Ludwig
a15562f8fd Updated "Designing for Security" documentation 
Change-Id: I1fe5b353d750695f75370ef31ae1b39e50159164
Signed-off-by: Adrian Ludwig <aludwig@google.com>
 2011-12-16 10:53:53 -08:00
Scott Main
fa0f39c545 am 611d03e6: docs: typos 
* commit '611d03e693aa8f7032e8a268bee1bfae9777e895':
  docs: typos
 2011-12-16 10:45:22 -08:00
Scott Main
611d03e693 docs: typos 
Change-Id: Iee489eb39029b5d550e37f49b1bd5d4cf30e445c
 2011-12-16 10:41:54 -08:00
The Android Open Source Project
57ea96a4b3 Reconcile with ics-mr1-release 
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
 2011-12-16 08:08:07 -08:00
Dirk Dougherty
4365a48612 am 8b6ed2d1: Doc change: edits to ICS MR1 API Overview. 
* commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
  Doc change: edits to ICS MR1 API Overview.
 2011-12-16 00:25:06 -08:00
Dirk Dougherty
8b6ed2d17d Doc change: edits to ICS MR1 API Overview. 
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
 2011-12-16 00:11:43 -08:00
Joe Fernandez
9b06f091c4 am 5b18c714: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
  docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 23:12:57 -08:00
Joe Fernandez
5b18c714bb Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17 docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6 
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
 2011-12-15 23:09:43 -08:00
Fred Chung
d30167f0cd am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '14633f1b1eea585cdc094ebae75708db2293fe56':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:35:10 -08:00
Fred Chung
14633f1b1e am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
 2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e Fixed Android U Enterprise lesson pre-requisites and a minor typo. 
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
 2011-12-15 22:25:19 -08:00
Scott Main
ed8851a6f2 am 8e980c1e: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 
* commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
  docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
 2011-12-15 22:14:48 -08:00
Scott Main
8e980c1e4e Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
4faca92faa am 36c67785: docs: update homepage for 4.0.3 announcment 
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
  docs: update homepage for 4.0.3 announcment
 2011-12-15 22:09:46 -08:00
Scott Main
36c677855c docs: update homepage for 4.0.3 announcment 
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
 2011-12-15 22:04:46 -08:00
Jamie Gennis
94180377e7 SurfaceMediaSource: use the HW_TEXTURE usage bit 
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
 2011-12-15 20:52:26 -08:00
The Android Automerger
ce2ac73d1d merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:50:02 -08:00
Scott Main
b193d24145 am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:22:39 -08:00
Scott Main
4cb7d09535 am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles) 
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
  docs: fix encoding issue or whatever with docs (not showing titles)
 2011-12-15 20:19:55 -08:00
Jamie Gennis
3e0f448fbe SurfaceMediaSource: use the HW_TEXTURE usage bit 
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
 2011-12-15 20:18:19 -08:00
Scott Main
98af5edc70 docs: fix encoding issue or whatever with docs (not showing titles) 
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
 2011-12-15 20:13:20 -08:00
Scott Main
34e46115a5 am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
  docs: add remembering users class to nav
 2011-12-15 19:59:25 -08:00
Scott Main
8f266b9e34 am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0 
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
  docs: add remembering users class to nav
 2011-12-15 19:56:47 -08:00
Scott Main
d9bc2d21c5 Merge "docs: add remembering users class to nav" into ics-mr0 2011-12-15 19:55:25 -08:00
Scott Main
98e4adf942 am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:55:00 -08:00