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

62900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Main
26e461b34f am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
  Doc merge from master:Training class on Identifying and Authenticating Users.
 2011-12-15 19:52:50 -08:00
Scott Main
2956f2fd2c docs: add remembering users class to nav 
Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
 2011-12-15 19:52:33 -08:00
Scott Main
5dac197619 Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 2011-12-15 19:51:48 -08:00
Scott Main
ec09b2691e am ce5643c7: am abfcbd16: docs: typo in training orientation 
* commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
  docs: typo in training orientation
 2011-12-15 19:49:50 -08:00
Scott Main
ce5643c7c4 am abfcbd16: docs: typo in training orientation 
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
  docs: typo in training orientation
 2011-12-15 19:47:47 -08:00
Dirk Dougherty
3b33cdcbf8 Doc merge from master:Training class on Identifying and Authenticating Users. 
Conflicts:

	docs/html/training/id-auth/authenticate.jd
	docs/html/training/id-auth/custom_auth.jd
	docs/html/training/id-auth/identify.jd
	docs/html/training/id-auth/index.jd

Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
 2011-12-15 19:45:27 -08:00
Scott Main
abfcbd162f docs: typo in training orientation 
Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
 2011-12-15 19:33:04 -08:00
Roman Nurik
0bc0e5e35a am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 
* commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e':
  docs: Minor bugfix to Android U navigation design class
 2011-12-15 19:27:25 -08:00
Roman Nurik
1584a816ed am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 
* commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
  docs: Minor bugfix to Android U navigation design class
 2011-12-15 19:25:25 -08:00
Dave Burke
0cc1e42d74 am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 
* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
 2011-12-15 19:25:07 -08:00
Dave Burke
ac279de9d9 Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 2011-12-15 19:23:26 -08:00
Roman Nurik
408f94b147 Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 2011-12-15 19:23:00 -08:00
Roman Nurik
265644e22a docs: Minor bugfix to Android U navigation design class 
Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f
 2011-12-15 19:20:02 -08:00
Jamie Gennis
09fc76664a 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 18:36:08 -08:00
Scott Main
6bbd38e986 am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 
* commit 'aeb06e34085703fe9699cdc3454558d69092bd7c':
  Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
 2011-12-15 17:41:58 -08:00