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

98314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a6d6fbfc8a am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 
* commit 'ff9414235a4d9052bd3003464be4649607447c9a':
  docs: misc bug fixes. including important versioning fixes for first app class
 2013-01-04 18:26:14 -08:00
Scott Main
ff9414235a am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 
* commit '181bb3aabc81f7e834e62874065c640dbc900f3e':
  docs: misc bug fixes. including important versioning fixes for first app class
 2013-01-04 18:23:58 -08:00
Scott Main
181bb3aabc am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 
* commit '921c8a5d86b08d331b757534a36ac519694ab2a2':
  docs: misc bug fixes. including important versioning fixes for first app class
 2013-01-04 18:20:57 -08:00
Scott Main
921c8a5d86 am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 
* commit '4e483ed30697472aceb05bb1555f14b066ee8502':
  docs: misc bug fixes. including important versioning fixes for first app class
 2013-01-04 18:19:00 -08:00
Scott Main
4e483ed306 Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 2013-01-04 18:16:16 -08:00
Scott Main
f8daf19971 docs: misc bug fixes. including important versioning fixes for first app class 
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
 2013-01-04 18:09:29 -08:00
Katie McCormick
1582b1d296 am 00ac55ed: am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip 
* commit '00ac55ed8b56721536eedf509ea754f4f3737d98':
  Doc update: fixed manifest typo in Network zip
 2013-01-04 17:51:08 -08:00
Brian Carlstrom
305efe23a3 am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit '498eaf58ad399e42cf7b3aca020b828c35023288':
  Use most specific attributes for distinguished name display
 2013-01-04 17:50:52 -08:00
Katie McCormick
00ac55ed8b am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip 
* commit 'dcab3ee6581fef5a2ed0e1e15a5d86d54ddbec6e':
  Doc update: fixed manifest typo in Network zip
 2013-01-04 16:42:06 -08:00
Katie McCormick
dcab3ee658 am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip 
* commit '789716346ac21248efa37d3a7eadad854bbff350':
  Doc update: fixed manifest typo in Network zip
 2013-01-04 16:39:35 -08:00
Katie McCormick
789716346a am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip 
* commit '928d2634ff9084ffc9d041b06fd7945cd8463801':
  Doc update: fixed manifest typo in Network zip
 2013-01-04 16:36:48 -08:00
Katie McCormick
928d2634ff am 2b13a475: Doc update: fixed manifest typo in Network zip 
* commit '2b13a475409aa28890c93088e86c065da1b07044':
  Doc update: fixed manifest typo in Network zip
 2013-01-04 16:34:19 -08:00
Katie McCormick
2b13a47540 Doc update: fixed manifest typo in Network zip 
Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320
 2013-01-04 16:17:45 -08:00
Brian Carlstrom
498eaf58ad am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit 'bc7d5a55b22ce30af250cc7468b6c5987cd25dfd':
  Use most specific attributes for distinguished name display
 2013-01-04 15:51:09 -08:00
Tor Norbye
72c6137a7a Handle empty flag attributes, such as gravity="" 
Without this, an empty string will be passed into
XmlUtils.convertValueToInt, which throws an
index out of range exception.

Change-Id: Ibd1a140e207653b205852087f33ccb87fbbb9bbc
 2013-01-04 15:48:58 -08:00
Brian Carlstrom
bc7d5a55b2 am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
  Use most specific attributes for distinguished name display
 2013-01-04 15:47:39 -08:00
Brian Carlstrom
537fb0afe2 Merge "Use most specific attributes for distinguished name display" 2013-01-04 15:40:35 -08:00
Brian Carlstrom
91154ce658 Use most specific attributes for distinguished name display 
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
 2013-01-04 15:27:24 -08:00
Romain Guy
48f7cfb106 Merge "Properly support ALPHA_8 bitmaps in all drawBitmap() methods" 2013-01-04 15:21:36 -08:00
Romain Guy
886b275e52 Properly support ALPHA_8 bitmaps in all drawBitmap() methods 
Change-Id: I869993c59e0a0d76f369c09acbae711753908f48
 2013-01-04 15:15:16 -08:00
Selim Gurun
5c11ef10db Remove doc references to private browsing. 
Remove reference to private browsing since it is no longer supported.

Change-Id: I65bc8aecd949717f662454d4bd1759ca91ad553d
 2013-01-04 14:58:36 -08:00
Scott Main
dd18adb28e am 4a95952b: am 105a581b: am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 
* commit '4a95952bc3ac6cef9ea2d00072de1fc5440a9a62':
  docs: update sony driver link and name bug: 6566732
 2013-01-04 11:44:09 -08:00
Scott Main
4a95952bc3 am 105a581b: am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 
* commit '105a581b4fad270cae3120c58903ba0241db1e6d':
  docs: update sony driver link and name bug: 6566732
 2013-01-04 11:40:38 -08:00
Scott Main
105a581b4f am 75420403: am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 
* commit '754204037234c2dbef8306df0066cb4edbf2a41c':
  docs: update sony driver link and name bug: 6566732
 2013-01-04 11:38:52 -08:00
Scott Main
7542040372 am 7edf8074: am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 
* commit '7edf80747171d61bf8f22e00a8318b2da5ae9400':
  docs: update sony driver link and name bug: 6566732
 2013-01-04 11:36:41 -08:00
Scott Main
7edf807471 am 197d0a66: Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 
* commit '197d0a6688ccf72632b461987671f1f2802935b7':
  docs: update sony driver link and name bug: 6566732
 2013-01-04 11:33:59 -08:00
Scott Main
197d0a6688 Merge "docs: update sony driver link and name bug: 6566732" into jb-mr1-dev 2013-01-04 11:29:32 -08:00
Scott Main
9c6cec7b89 docs: update sony driver link and name 
bug: 6566732

Change-Id: I8cb6e3295a24a7876d9cc9493889d85688357f79
 2013-01-04 11:24:10 -08:00
Robert Ly
64e7e22c5f am 1b1766f1: am 7ae93164: am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 
* commit '1b1766f1003895eff65ab73148221fa2b5f0db1f':
  docs: update gms and gcm javadocs with new TOC
 2013-01-04 11:17:56 -08:00
Robert Ly
1b1766f100 am 7ae93164: am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 
* commit '7ae9316428087846d588d3a8f70fa649ebf5e090':
  docs: update gms and gcm javadocs with new TOC
 2013-01-04 11:11:29 -08:00
Robert Ly
7ae9316428 am 29618824: am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 
* commit '296188242d15c34229aaa2c5d87960dca7d1285a':
  docs: update gms and gcm javadocs with new TOC
 2013-01-04 11:09:07 -08:00
Robert Ly
296188242d am e478fb4f: am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 
* commit 'e478fb4fa74771863f8c98c04e93a1bd4f2f46ae':
  docs: update gms and gcm javadocs with new TOC
 2013-01-04 11:06:15 -08:00
Robert Ly
e478fb4fa7 am 6b79e954: Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 
* commit '6b79e9542b2b2fae18a882696e61adb4fce144eb':
  docs: update gms and gcm javadocs with new TOC
 2013-01-04 11:03:04 -08:00
Robert Ly
6b79e9542b Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev 2013-01-04 10:58:55 -08:00
Robert Ly
d84d5ccdd4 docs: update gms and gcm javadocs with new TOC 
Change-Id: Ic54c4e4e6e2b0008450abe9d3aa1ae53535d9160
 2013-01-04 10:41:41 -08:00
suyi Yuan
be7af83829 Correcting typo in doc of MEDIA_XXX intents 
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.

Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
 2013-01-04 21:21:59 +08:00
Elliott Hughes
0aa212e32a am a74d1332: am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak"" 
* commit 'a74d1332cc9f63dc3187cfa74befb448dab5e77d':
  Revert "fix potential memory leak"
 2013-01-03 18:53:06 -08:00
Elliott Hughes
6bbc79f26e am f18eb323: am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak" 
* commit 'f18eb323c38cd4407b16dc8eda1cc860bb100850':
  fix potential memory leak
 2013-01-03 18:53:02 -08:00
Elliott Hughes
a74d1332cc am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak"" 
* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e':
  Revert "fix potential memory leak"
 2013-01-03 18:50:08 -08:00
Elliott Hughes
f18eb323c3 am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak" 
* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf':
  fix potential memory leak
 2013-01-03 18:50:03 -08:00
Elliott Hughes
81cfb63e9f am d13b23a4: Merge "Revert "fix potential memory leak"" 
* commit 'd13b23a436075262cc83f7502f7159de24546003':
  Revert "fix potential memory leak"
 2013-01-03 18:47:37 -08:00
Elliott Hughes
767e1c010c am 9aac0c1b: Merge "fix potential memory leak" 
* commit '9aac0c1b35ec666a18f320be99e6aa37d0bcf202':
  fix potential memory leak
 2013-01-03 18:47:32 -08:00
Scott Main
8a4e3fd2ab am c41db6c9: am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit 'c41db6c9ba298c8fac5068ad2843b4aa58ecf1c5':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:47:12 -08:00
Scott Main
c41db6c9ba am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '834b0f3cd90679655ac1549cb427fc9475ac4a4b':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:44:22 -08:00
Scott Main
834b0f3cd9 am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '19b17b419cb11c2ff064021ebdd0dda1daab4c35':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:42:05 -08:00
Roger Chen
1740ada533 Handle nested folder case 
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-01-03 18:39:34 -08:00
Scott Main
19b17b419c am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '38a642e987612da86dc4f30b8d2c66a4a4833682':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:38:56 -08:00
Scott Main
38a642e987 am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '3e2479dd20ee9a1dab17e5dbec7fc835f2fa427f':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:36:45 -08:00
Scott Main
3e2479dd20 Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 2013-01-03 18:32:45 -08:00
Scott Main
188315cf8b docs: fix broken links and add new sitemap text file 
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
 2013-01-03 18:02:21 -08:00