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

1070 Commits

Author SHA1 Message Date
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
Joe Malin
ac294abb40 Revision to Notifications API guide 
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
 2012-11-01 12:57:58 -07:00
Scott Main
22d17c984a docs: misc changes for new manifest attributes, 
including fix for bug 7443821
bug 7442263

Change-Id: I20b712bf2b0379c70ff28682025d6f30817a6c36
 2012-11-01 10:39:41 -07:00
Scott Main
e9b533bff0 am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface 
* commit '82f0ba79e67c154fc12a6cfde2fe1205da166b0d':
  revise code sample for callback interface
 2012-10-18 12:31:05 -07:00
Scott Main
4a6b69488f am 07322102: revise code sample for callback interface 
* commit '07322102e5f1877bc2860d2c72eeeb41839d6bea':
  revise code sample for callback interface
 2012-10-18 12:18:31 -07:00
Scott Main
07322102e5 revise code sample for callback interface 
Change-Id: I8e27e2579dcc5cb84a71c74769fb89bb639e16ba
 2012-10-17 15:40:53 -07:00
Scott Main
6b77a76d3f am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit '5dc7ac745300fb043267a0c9235244a115507c51':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:17:03 -07:00
Scott Main
a7b56a20ec am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications 
* commit 'e249763db18bb445e93f493046946c13185aa09d':
  small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
 2012-10-12 14:12:07 -07:00
Scott Main
e249763db1 small update to Toast guide, flatten sidenav for notifications/toasts, 
new screenshots for notifications

Change-Id: I0c02e9e6db70a60ca299ff7f0caa7c8276b7ab68
 2012-10-12 12:06:10 -07:00
Joe Malin
87afd6eb4b am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide 
* commit '54a1e4d4c4216af987c7b769723cd2e59ca2c233':
  DOC CHANGE: Notifications Guide
 2012-10-11 17:42:46 -07:00
Joe Malin
5832d1ce72 am 01154bda: DOC CHANGE: Notifications Guide 
* commit '01154bdae9d6f3d1fbed3169ffa194d51045c9cf':
  DOC CHANGE: Notifications Guide
 2012-10-11 17:38:46 -07:00
Joe Malin
01154bdae9 DOC CHANGE: Notifications Guide 
Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42
 2012-10-11 16:55:12 -07:00
Robert Ly
0f31450fe0 am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 
* commit 'fba8b7f5963cb2bc15f06d83d986345978cc415e':
  docs: nfc ndef helper methods bug 5957772
 2012-10-09 11:42:14 -07:00
Robert Ly
f19e4b420d Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 2012-10-09 11:38:00 -07:00
Robert Ly
1f415fa2ea docs: nfc ndef helper methods bug 5957772 
Change-Id: I9c8356f44c1f9cc4a5187d40816cbfdd6212ab6e
 2012-10-08 16:59:39 -07:00
Scott Main
ab781ba0f0 am d4c18b01: am b31d0b3b: am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 
* commit 'd4c18b01cc152f97ea30146d0ad795c05b59e178':
  re-write the Dialog guide to focus on using DialogFragment
 2012-10-03 16:18:23 -07:00
Scott Main
b31d0b3b6d am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 
* commit 'd2e9486bbf88cfe83f9ce3a7e2f86ea4ddf271bc':
  re-write the Dialog guide to focus on using DialogFragment
 2012-10-03 16:15:04 -07:00
Scott Main
d2e9486bbf Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs 2012-10-03 16:12:36 -07:00