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

737 Commits

Author SHA1 Message Date
Dirk Dougherty
f1275e74cb am 87bdfd6d: am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair 
Merge commit '87bdfd6d22ee964339791bb65686a718d207793b'

* commit '87bdfd6d22ee964339791bb65686a718d207793b':
  Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
 2010-02-10 09:46:08 -08:00
Dirk Dougherty
87bdfd6d22 am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair 
Merge commit 'd74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp

* commit 'd74bf1623913bade8f58369f39ebc666d551bb57':
  Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
 2010-02-10 09:41:15 -08:00
Dirk Dougherty
d74bf16239 Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair 2010-02-10 09:38:01 -08:00
Dirk Dougherty
f3449ee853 am e524ff53: am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair 
Merge commit 'e524ff534e1aabc45819e978c26bf61d9b71f444'

* commit 'e524ff534e1aabc45819e978c26bf61d9b71f444':
  Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
 2010-02-09 18:48:59 -08:00
Dirk Dougherty
9553703476 Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper. 
Change-Id: I63f881739352d91d296c5c07432eeda74b22000a
 2010-02-09 18:45:47 -08:00
Dirk Dougherty
e524ff534e am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair 
Merge commit '859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp

* commit '859f455645bc49e32330108b1ea9f85ffb80a2cd':
  Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
 2010-02-09 18:44:18 -08:00
Dirk Dougherty
d323b4c338 Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper. 
Change-Id: Idbeda9a677c9772a8348146fe028083d9887a9d2
 2010-02-09 18:38:30 -08:00
Katie McCormick
b5c01b96a8 am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair 
Merge commit '8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp

* commit '8a6c060719c8870f370b82faa48ae2f437915214':
  SDK doc change: Fixed typo--fingure->finger
 2010-02-03 20:21:26 -08:00
Katie McCormick
8a6c060719 Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair 2010-02-03 16:52:18 -08:00
Katie McCormick
db72f1ba85 SDK doc change: Fixed typo--fingure->finger 
Bug: 1993220
 2010-02-03 16:37:15 -08:00
Scott Main
952e39578d Merge commit '2f7b69aa' into manualmerge 
Conflicts:
	docs/html/guide/topics/ui/themes.jd
 2010-02-03 16:37:03 -08:00
Scott Main
2f7b69aab9 am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair 
Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp

* commit '98a9fc0a0025a3df7b36f7752fc330eba8810603':
  docs: revise the Style and Themes document to improve the
 2010-02-03 16:18:17 -08:00
Scott Main
98a9fc0a00 Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair 2010-02-03 16:11:41 -08:00
Scott Main
4d5770904c docs: revise the Style and Themes document to improve the 
clarity of the concepts and expand the available information
 2010-02-03 14:50:15 -08:00
Megha Joshi
1d91f2e416 am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair 
Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0'

* commit 'b299f802b2dea19b003a6724d53ecff1b763bab0':
  Screenshots for sample syncadapter.
 2010-02-03 12:34:53 -08:00
Megha Joshi
b299f802b2 am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair 
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp

* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
  Screenshots for sample syncadapter.
 2010-02-03 12:29:19 -08:00
Megha Joshi
9f4cfc3afc Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00
Megha Joshi
021a90dbaa Screenshots for sample syncadapter. 2010-02-03 11:21:45 -08:00
Scott Main
3b889f5219 am 1076ea0a: am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 
Merge commit '1076ea0abe3cace6629063d63ee1242a5a7588a2'

* commit '1076ea0abe3cace6629063d63ee1242a5a7588a2':
  docs: update web page debugging with info about page and line
 2010-01-29 13:52:30 -08:00
Scott Main
1076ea0abe am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 
Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp

* commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
  docs: update web page debugging with info about page and line
 2010-01-29 13:47:40 -08:00
Scott Main
9800adf2a4 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Scott Main
7b02e924b0 docs: update web page debugging with info about page and line 
numbering in the log.
 2010-01-29 12:17:32 -08:00
Dirk Dougherty
1f40f174e7 am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a'

* commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:52:43 -08:00
Dirk Dougherty
b574cf876e am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp

* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
 2010-01-28 16:46:54 -08:00
Dirk Dougherty
95b528eab5 SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features. 
Bug: 2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
 2010-01-28 16:26:50 -08:00
Dirk Dougherty
59e8fc5f53 am 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 
Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d'

* commit '67a658567a6bad898c097e615f8efcb3c91fa50d':
  doc change only: Update announcement and mwc redirect to point to microsite.
 2010-01-28 15:10:19 -08:00
Scott Main
e7d9ba249a am 9985feca: am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 
Merge commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174'

* commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174':
  docs: reference the history JS file with docRoot in order to
 2010-01-28 13:44:35 -08:00
Dirk Dougherty
57853a8aec am 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a'

* commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a':
  SDK doc change: Misc small fixes.
 2010-01-28 12:37:21 -08:00
Dirk Dougherty
cf5769877b am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8'

* commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-28 12:37:10 -08:00
Dirk Dougherty
5f551ef6a8 am 97ca28cd: am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 
Merge commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9'

* commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9':
  doc change: add announce for developer lab at mwc. move adc to carousel.
 2010-01-28 10:48:15 -08:00
Dirk Dougherty
67a658567a am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp

* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
  doc change only: Update announcement and mwc redirect to point to microsite.
 2010-01-26 18:05:23 -08:00
Dirk Dougherty
965f4a6b4b Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 2010-01-26 18:00:29 -08:00
Dirk Dougherty
dc19ba8af9 doc change only: Update announcement and mwc redirect to point to microsite. 
Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
 2010-01-26 16:58:33 -08:00
Xavier Ducrohet
cda4d7bea2 am 48edf7c0: am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3." 
Merge commit '48edf7c00201f2bc6186e07dbc614976642682e4'

* commit '48edf7c00201f2bc6186e07dbc614976642682e4':
  Revert "SDK doc change: Add doc update for NDKr3."
 2010-01-25 18:11:20 -08:00
Xavier Ducrohet
0481170a85 am a0ecd4fb: am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair 
Merge commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870'

* commit 'a0ecd4fbe65ffb00afb3043584a3d08ee41b0870':
  SDK doc change: Add doc update for NDKr3.
 2010-01-25 18:10:42 -08:00
Scott Main
1ce80a4d7a am bfb86068: am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 
Merge commit 'bfb8606831d5a5776301733cde3650d237870453'

* commit 'bfb8606831d5a5776301733cde3650d237870453':
  docs: add guide to copying and installing the Dev Tools app
 2010-01-25 18:10:13 -08:00
Scott Main
9985fecaa0 am d243bc71: Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 
Merge commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp

* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
  docs: reference the history JS file with docRoot in order to
 2010-01-25 16:54:20 -08:00
Scott Main
d243bc710c Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 2010-01-25 15:39:46 -08:00
Scott Main
d644edb6d8 docs: reference the history JS file with docRoot in order to 
make offline doc searches work. (I think this was a regression
due to a missed merge.)
Bug: 1909300
 2010-01-25 14:47:46 -08:00
Dirk Dougherty
99988b6ee6 am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp

* commit '8420795633443221627eb872aea8f2862a38f8b1':
  SDK doc change: Misc small fixes.
 2010-01-22 16:50:03 -08:00
Dirk Dougherty
43d5a09f46 am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp

* commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-22 16:49:57 -08:00
Dirk Dougherty
8420795633 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Dirk Dougherty
c5de95bf25 Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Dirk Dougherty
5bc32d3539 SDK doc change: Misc small fixes. 
Bug:2160782
Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
 2010-01-22 15:11:00 -08:00
Dirk Dougherty
83d092573e SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager. 
Bug: 2160782
Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
 2010-01-22 14:31:47 -08:00
Dirk Dougherty
97ca28cdd9 am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 
Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp

* commit '5d14cb34c0e9760340c15ac5faf2d76a64797117':
  doc change: add announce for developer lab at mwc. move adc to carousel.
 2010-01-22 14:28:05 -08:00
Dirk Dougherty
5d14cb34c0 Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 2010-01-22 14:23:39 -08:00
Dirk Dougherty
a0fc438334 doc change: add announce for developer lab at mwc. move adc to carousel. 
Bug: 2160782
Change-Id: I657738d9452058a2078d81d65b5747b1676a3230
 2010-01-22 13:22:42 -08:00
Scott Main
4789f0cd16 am 382f924c: am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file 
Merge commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4'

* commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4':
  docs: a lot of revision and expansion of the hello view tutorials
 2010-01-22 12:00:42 -08:00
Scott Main
95127b8e44 am 5ed68156: am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair 
Merge commit '5ed681561c5904eb55a275387f1df8cec401361c'

* commit '5ed681561c5904eb55a275387f1df8cec401361c':
  docs: add a section about debugging web pages with the Console APIs;
 2010-01-22 12:00:00 -08:00