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

987 Commits

Author SHA1 Message Date
Scott Main
e63dfe5a48 docs: fix broken links 
Change-Id: I7c63b1a2cfe016744fbef532354821bff024ee17
 2013-02-01 14:18:51 -08:00
Scott Kennedy
2fd47fea32 am b61121d2: am ee6f89ff: am 3332aa98: am d7ec742c: docs: Minor typos 
* commit 'b61121d2a162493e97530fc7a6cbfce47c014b00':
  docs: Minor typos
 2013-01-16 10:15:54 -08:00
Scott Kennedy
a8396686a2 docs: Typos and other fixes 
External 42844
External 42778
External 42768
External 42730
External 42720
External 42678
External 39381

Change-Id: Ia9d54ce87dc266650d0620fd3adc63137322e20b
 2013-01-16 10:07:13 -08:00
Scott Kennedy
d7ec742c30 docs: Minor typos 
One of these was mentioned in a comment in external 40435

Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4
 2013-01-15 19:33:56 -08:00
Scott Kennedy
7e553e15d9 am d50a0383: am ff5b7393: am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev 
* commit 'd50a038340935a0ea8cf8fadce7e21b640b58db0':
  docs: Another fix for external 42607
 2013-01-15 14:54:22 -08:00
Scott Kennedy
4aea83b1d1 docs: Another fix for external 42607 
Follow-up to If4215cef850ba8e4e8df356a68192566806e7914

Change-Id: I70a7a9f6a5be654b1fab9645c87da304b33aec5b
 2013-01-15 08:52:37 -08:00
Dirk Dougherty
f37d9c07b2 am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit 'b78714b5dfc871fee251db125ec5e14f4e0aff5f':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:30:34 -08:00
Dirk Dougherty
20d47ca81d Doc change: add developer video to carousel and spotlight pages. 
Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7
 2013-01-14 20:47:11 -08:00
Scott Kennedy
aebeea4cf3 am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev 
* commit '5d6d6aab255aa17fde979d954c839402837b4243':
  docs: Fix a bunch of issues
 2013-01-14 11:15:55 -08:00
Christopher Tate
af77f071ff am c4802638: am c8074612: Merge "Fix the spelling of "retrieves"" 
* commit 'c4802638d85b563df8218873504c9f9100f67e2c':
  Fix the spelling of "retrieves"
 2013-01-14 11:02:33 -08:00
Christopher Tate
c4802638d8 am c8074612: Merge "Fix the spelling of "retrieves"" 
* commit 'c80746125ef5bcb44e6b2f459abd2dfdc67f4f61':
  Fix the spelling of "retrieves"
 2013-01-14 10:59:57 -08:00
Scott Kennedy
7ed189e457 docs: Fix a bunch of issues 
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441

Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
 2013-01-11 23:44:11 -08:00
Scott Kennedy
13b8449515 Fix the spelling of "retrieves" 
Change-Id: I33360c573a6ca7b88d0cac834caad547d66b0b2a
 2013-01-11 21:50:31 -08:00
Scott Main
8a05d13ef6 am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev 
* commit '5b56d43237d959403bb8a32de25376deee2dab22':
  docs: resolve bugs from external tracker
 2013-01-08 12:52:38 -08:00
Scott Main
6aad995042 docs: resolve bugs from external tracker 
Change-Id: I680970ec63701197103f6c5ab55c25c736aa0519
 2013-01-08 12:02:38 -08:00
Scott Main
aa516b10dd am 76c28e54: am 7fc128fe: am b2039756: am e30d31c4: docs: misc bugs from external tracker 
* commit '76c28e54b876207d468309aecb2ff2f4708a6ca4':
  docs: misc bugs from external tracker
 2013-01-07 16:06:40 -08:00
Scott Main
e30d31c4e8 docs: misc bugs from external tracker 
Change-Id: I928659b23d1ff3a5d017d4fb50acb8ac0e3b251b
 2013-01-07 15:54:30 -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
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
Scott Main
1a9c5a5f82 am 96f0e008: am 481102ee: am 0dae634b: Merge "docs: add class on keyboards" into jb-mr1-dev 
* commit '96f0e00825cf1bf0f14c358b87394b426020a77b':
  docs: add class on keyboards
 2012-12-21 16:40:25 -08:00
Scott Main
51627153b9 am 8c8fd247: am cee5267b: am dc2c1a0f: docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441 
* commit '8c8fd247a6a7f49031251ba11036779a41d9a2bf':
  docs: add explanation of default permissions to Permission guide and fix code snippet error in WebView guide. external issue:41441
 2012-12-21 16:33:40 -08:00
Scott Main
0dae634b06 Merge "docs: add class on keyboards" into jb-mr1-dev 2012-12-21 16:25:50 -08:00
Scott Main
c8a6f8a041 docs: add class on keyboards 
Change-Id: I3fb179457af50eec9d111f84eb9fabf49bc7ab1b
 2012-12-21 16:24:36 -08:00
Scott Main
dc2c1a0f80 docs: add explanation of default permissions to Permission guide 
and fix code snippet error in WebView guide.
external issue:41441

Change-Id: I5d021e4f04245385b62e992baebd702814fff930
 2012-12-21 16:19:52 -08:00
Scott Main
bd3b1ca82c am 97fab2ca: am b86695d6: am b00e37de: docs: update location/maps doc with info for maps api 
* commit '97fab2ca0213696fa140c4ecc7fcb61d0d75e804':
  docs: update location/maps doc with info for maps api
 2012-12-03 00:18:18 -08:00
Scott Main
b00e37de18 docs: update location/maps doc with info for maps api 
Change-Id: I793f47791883efe88ff0d6c8effe0787d9654a88
 2012-12-02 19:00:48 -08:00
Dirk Dougherty
fa4596131d am 6875b438: am a4f67a88: am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 
* commit '6875b4385c1d1e4c1160ba6cd9128a461565338b':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
 2012-11-29 21:20:00 -08:00
Dirk Dougherty
2b286bb26b Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved. 
Change-Id: I5528e82a6f97eb25f2ec2db5dfe1e178d9580f3c
 2012-11-29 21:07:41 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
Scott Main
14120b9ce3 am 68395a61: am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev 
* commit '68395a61489c560e68a9f8321df96ccdf776d1b6':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
 2012-11-19 11:54:29 -08:00
Jaewan Kim
ff5941399e cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 
Fix typo

Change-Id: Idd09f7fea890dbc290589b1ebe4a1a139f98c740
 2012-11-19 11:43:56 -08:00
kmccormick@google.com
9fd5f0940b am afbf515b: am 47972cea: am 480ac7fc: am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'afbf515be3ed51cf7db228b52fcc15440310877e':
  Doc Update: Fixing images
 2012-11-15 10:00:12 -08:00
kmccormick@google.com
480ac7fca6 am 596d0e38: am f53c5f36: am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit '596d0e3881782096f7a6ea9959e8dc5f07004623':
  Doc Update: Fixing images
 2012-11-15 09:51:56 -08:00
kmccormick@google.com
f53c5f3683 am d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs 
* commit 'd1ae2721fa7b350b979e75319812636ea31bb56b':
  Doc Update: Fixing images
 2012-11-15 09:45:46 -08:00
&& repo sync -j8
1019a9c44e Doc Update: Fixing images 
Bug: 7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
 2012-11-14 18:27:36 -08:00
Scott Main
1286316939 am 1190b77d: am 46ba7860: am 65bd44fe: Merge "docs: add jb mr1 api overview" into jb-mr1-dev 
* commit '1190b77dfa16502117b9c80e4fe4c1a64f4acb28':
  docs: add jb mr1 api overview
 2012-11-13 02:34:10 -08:00
Scott Main
65bd44fe44 Merge "docs: add jb mr1 api overview" into jb-mr1-dev 2012-11-13 02:25:47 -08:00
Scott Main
576552550d docs: add jb mr1 api overview 
Change-Id: I05db9daa6b9b96fef2debabdf35bcbe169fed007
 2012-11-13 02:23:51 -08:00
Robert Ly
d87f1819db am db5fb998: am 0fe6febf: am b03ce7eb: Merge "docs: add fs to rs" into jb-mr1-dev 
* commit 'db5fb998d23da8b71a9b2c5b527832cf9558184c':
  docs: add fs to rs
 2012-11-12 22:30:20 -08:00
Robert Ly
b03ce7eb9f Merge "docs: add fs to rs" into jb-mr1-dev 2012-11-12 22:22:25 -08:00
Robert Ly
3419e07873 docs: add fs to rs 
Change-Id: Icb08977ecf5acbddff35965fa1d7360cece0dd31
 2012-11-12 21:56:32 -08:00
Katie McCormick
52d7404144 am d104705b: am 359c78a6: am f887b563: Merge "Doc update: Appwidgets MR1 lockscreen support." into jb-mr1-dev 
* commit 'd104705b770bcabd1286485686bb8fb262d75ff9':
  Doc update: Appwidgets MR1 lockscreen support.
 2012-11-12 18:29:37 -08:00
Katie McCormick
f887b5631e Merge "Doc update: Appwidgets MR1 lockscreen support." into jb-mr1-dev 2012-11-12 18:22:34 -08:00
Katie McCormick
7edb7a509f Doc update: Appwidgets MR1 lockscreen support. 
Change-Id: I637e27aa968614deb1e7f16399f459875ad04130
 2012-11-08 14:59:22 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Scott Main
465c37533a Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev 2012-11-01 15:14:25 -07:00
Joe Malin
1f177cb87a am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide 
* commit 'e639d67aeb0e2758f2480c25e8ab007918701ed3':
  Revision to Notifications API guide
 2012-11-01 14:00:54 -07:00
Joe Malin
d2e163461e am ac294abb: Revision to Notifications API guide 
* commit 'ac294abb40483fc734e22833371d95cbb161ec87':
  Revision to Notifications API guide
 2012-11-01 13:55:08 -07:00