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

420 Commits

Author SHA1 Message Date
Scott Rowe
5d520df856 am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit '7a940a49745f51425e60bfde38b8c0dab454ef8b':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:23:40 +00:00
Scott Rowe
3d55247a3f am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit 'a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:08:45 +00:00
Scott Rowe
6d05170a55 docs: b/14510382 ISO language code, add link 
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
 2014-05-16 22:33:12 +00:00
Dirk Dougherty
9a6672beb1 resolved conflices for merge of 93ccd1a2 to master 
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
 2014-05-14 14:50:13 -07:00
Dirk Dougherty
0540bc373c am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute. 
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
  Doc change: Updated content for distribute.
 2014-05-14 21:21:15 +00:00
Dirk Dougherty
3506ac87c0 Doc change: Updated content for distribute. 
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
 2014-05-14 14:10:51 -07:00
quddusc
e49ba1a3fc am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'f403d60fc8dfe2b833a65b6933a07c44d849e831':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:45:01 +00:00
quddusc
17878a9ab5 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:32:35 +00:00
quddusc
7db3875cdc Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 2014-04-05 22:23:36 +00:00
Katie McCormick
6652b98339 am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'de4fedefbf4772e15bb9aa95458fd2f314cdb502':
  Doc Update: notification bug fix.
 2014-04-04 21:41:49 +00:00
Katie McCormick
8e63696a73 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'f7bffe7707f31da920a8ff08d013934562e9a43d':
  Doc Update: notification bug fix.
 2014-04-04 21:31:28 +00:00
Katie McCormick
fc8ea92df1 Merge "Doc Update: notification bug fix." into klp-docs 2014-04-04 21:12:16 +00:00
Katie McCormick
507c9fd016 Doc Update: notification bug fix. 
Fixes:

b/13429906

Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
 2014-04-04 14:07:35 -07:00
Ricardo Cervera
d09e5606a5 am 1ac6519b: am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit '1ac6519b245c008ea6b3b6baba205fb58d75c807':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:46:28 +00:00
Ricardo Cervera
c31bd52df2 am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit 'a821af684e2a5f814fc8709518b5f0589c81661e':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:32:42 +00:00
Ricardo Cervera
7f427b45bd docs: Fixed action bar example. Bug: 13806963 
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
 2014-04-04 09:46:11 -07:00
Ricardo Cervera
fb0873268c am 04c2a557: am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 
* commit '04c2a5571620927f702af3707845b1b05769dc46':
  docs: Added notes to use the last SDK version to the Build your First App class.
 2014-04-02 00:27:51 +00:00
Ricardo Cervera
c013eaad57 am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 
* commit '5a218b186735534925d7fedb63f1c78a3a3ff543':
  docs: Added notes to use the last SDK version to the Build your First App class.
 2014-04-02 00:15:31 +00:00
Ricardo Cervera
8e5775daae docs: Added notes to use the last SDK version to the Build your First App class. 
Change-Id: I35820ff887b3d0f4ccc0ce7720576e3e692109b5
 2014-04-01 10:46:16 -07:00
quddusc
3d7b134d08 docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. 
Bug: 13487101

Change-Id: If62a7415262877b7ef4ca19fcf0ab77c5323f1cb
 2014-03-26 15:03:06 -07:00
Adam Koch
52eb953278 am c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit 'c5640ea55aebf86ab652f5a2f8e00e130c479291':
  Point bitmaps training class to new samples directory.
 2014-03-20 21:05:31 +00:00
Adam Koch
8bc12a5149 am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
  Point bitmaps training class to new samples directory.
 2014-03-20 16:59:23 +00:00
Adam Koch
6398a86f1b Merge "Point bitmaps training class to new samples directory." into klp-docs 2014-03-20 07:12:06 +00:00
Adam Koch
21e3372d39 Point bitmaps training class to new samples directory. 
Change-Id: I5c5ca9619fe47c79066db846cbbee1b26d71826e
 2014-03-20 14:56:41 +08:00
Ricardo Cervera
4656ac9fe6 am d387206a: am 7890eeff: am 882ba89b: am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 
* commit 'd387206a84a35b86663adb5bf00671cafbf6aee4':
  docs: Updated Building your First App tutorial. Bug: 13429905
 2014-03-14 17:54:11 +00:00
Ricardo Cervera
882ba89bf4 am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs 
* commit '506949173761f9bde016b9d74de94df4b63df370':
  docs: Updated Building your First App tutorial. Bug: 13429905
 2014-03-14 16:28:46 +00:00
Ricardo Cervera
420d97fbc8 docs: Updated Building your First App tutorial. Bug: 13429905 
-Updated default code in activities from ADT
-Updated screenshots for ADT wizards when changed
-Updated activity_ with fragment_ where required
-Other minor changes

Stage: http://quixote.mtv:8004/training/basics/firstapp/creating-project.html

Patch: Removed border from the new ADT screenshots.
Patch: Replaced device screenshots using an Android 4.4 device.
Patch: Addressed Katie's comments.

Change-Id: Ic0acf714b1b5913f1f82d6eafac53666a721dfe4
 2014-03-13 14:59:59 -07:00
Katie McCormick
43750f19e7 am b8645efb: am caec59c1: am d2e6c89a: am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit 'b8645efbc8b7f57168d1f5108b65e5bea576b1d1':
  Doc update: clarify best practices.
 2014-02-11 20:35:01 +00:00
Katie McCormick
d2e6c89a24 am 0a96a82b: am 0cb2c76b: Merge "Doc update: clarify best practices." into klp-docs 
* commit '0a96a82bbe153ed2337b67435016d35eb434da16':
  Doc update: clarify best practices.
 2014-02-11 20:22:00 +00:00
Katie McCormick
0cb2c76b66 Merge "Doc update: clarify best practices." into klp-docs 2014-02-11 20:13:34 +00:00
Katie McCormick
49f93486a9 Doc update: clarify best practices. 
Fix for:

b/12515292

Change-Id: I1616d41c052582ff6c82b87cd0282cf1d25bb84d
 2014-02-10 19:06:17 -08:00
Ricardo Cervera
1a73859489 am a11ac26b: am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit 'a11ac26b0e012eb9b9829afc74095a5cc6292452':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:38:43 +00:00
Ricardo Cervera
332aefe931 am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit 'd038afd39874238357a5ca9621921542f57db7a1':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:26:19 +00:00
Ricardo Cervera
7e4b48668e docs: Fixed ViewPager animation tutorial. Bug: 12815243 
Went through the tutorial and fixed a few minor issues. There is
confusion with Fragment and FragmentManager from the support library
vs. the main Android APIs. Clarified this by showing some imports
explicitly. Tested the new code from the page on Eclipse and it works
as expected.

Change-Id: I8494a72f4c760a03a6b8f3322c5754e315f22e7c
Review: http://quixote.mtv.corp.google.com:8002/training/animation/screen-slide.html
 2014-02-07 20:44:44 +00:00
Adam Koch
268d7ad329 am 310b1e51: am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit '310b1e511f92c6972ccda2c7a779116fc0f89ced':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-30 01:58:22 +00:00
Adam Koch
6e1ce75f4c am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit 'b430d93b058a706be731e45f8c1836d97219a666':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-29 23:09:58 +00:00
Adam Koch
a816db990c Doc fix: Update code snippet in displaying bitmaps training class 
Bug: 12715659

Change-Id: I33ad0ae04ff8855a3fc09a312830e0277dcfe70d
 2014-01-29 14:52:28 +11:00
quddusc
afc4deb7b3 am ddef0ec9: am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'ddef0ec94b01b18f4452dea7ed98a4ff5184e49b':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:56:16 +00:00
quddusc
c99557c92c am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '0cb965a69aac9c2a83798960a0efeaa6e596e445':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-21 20:13:48 -08:00
quddusc
5020a8736f Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 2014-01-22 04:07:18 +00:00
quddusc
1dff746b02 cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da 
Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705
 2014-01-21 18:53:57 -08:00
Scott Main
4dc4e848fb am 52288441: am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typo 
* commit '52288441428d68337e01def025e540bc8ed968f6':
  fix code typo
 2014-01-22 02:03:05 +00:00
Scott Main
69edcce783 am d9d41f2d: am fbdcf317: fix code typo 
* commit 'd9d41f2db29a4bd9bcf3b064067f41742a9265e9':
  fix code typo
 2014-01-21 17:52:05 -08:00
Scott Main
fbdcf317fa fix code typo 
Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
 2014-01-21 10:12:07 -08:00
Marco Nelissen
a6a7f2ffc4 Update doc wrt to android:debuggable and CheckJNI 
Change-Id: Id75642440c8bc86727655debf21c47a1c228bd28
 2014-01-16 15:45:47 -08:00
Ricardo Cervera
f12fa01220 am 72e2c2a0: am bb6c94f9: am 8f8a6145: am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '72e2c2a0b4df1d48e19b055d353094000c021c22':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 15:33:34 +00:00
Ricardo Cervera
8f8a614534 am 294d5f79: am 1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 
* commit '294d5f790a564ac5f21d3dcfd1054abe544505a5':
  docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
 2014-01-16 07:25:04 -08:00
Ricardo Cervera
1d2a4e7b9f Merge "docs: Fixed typos in audio-focus.jd. Bug: 12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs 2014-01-16 01:26:14 +00:00
Ricardo Cervera
f5749ac4ef am b5466418: am 7984122e: am 04666c91: am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp- 
* commit 'b5466418d1313c59801a4acafa17b86ee4950f50':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-16 00:34:05 +00:00
Ricardo Cervera
04666c9180 am 96f6ce38: am 291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs 
* commit '96f6ce38e383c0a2d416678bdfce41426e3f6b45':
  docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug: 11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
 2014-01-15 16:24:18 -08:00