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

6314 Commits

Author SHA1 Message Date
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
a11ac26b0e am 9d6e456d: am 332aefe9: am d038afd3: am 7074f324: Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 
* commit '9d6e456d777a147444da650e10ca9dfc1a64b9cd':
  docs: Fixed ViewPager animation tutorial. Bug: 12815243
 2014-02-10 17:32:25 +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
7074f32440 Merge "docs: Fixed ViewPager animation tutorial. Bug: 12815243" into klp-docs 2014-02-10 17:19:28 +00:00
Katie McCormick
dd99d87a12 am ffc641dd: am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit 'ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3':
  Doc update: misc GCM fixes
 2014-02-10 13:16:42 +00:00
Dirk Dougherty
7dd9c23778 am 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
  Doc change: add carousel and spotlight for developer video.
 2014-02-10 13:16:38 +00:00
Katie McCormick
ffc641dd54 am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit '6366dcbd494afe20912a932bb18faf199e4a1c62':
  Doc update: misc GCM fixes
 2014-02-08 18:44:52 +00:00
Dirk Dougherty
91bdc7d4be am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '3333166738ca1382307bcf61e30adba6bdec83d4':
  Doc change: add carousel and spotlight for developer video.
 2014-02-08 18:44:49 +00:00
Katie McCormick
bcc27903fb am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 
* commit '44085b68add3d7583f7832c51409de83655fc4f1':
  Doc update: misc GCM fixes
 2014-02-08 18:34:54 +00:00
Dirk Dougherty
3f43b64629 am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '7fd4d29e847984c02561c7f385bfe0947432012e':
  Doc change: add carousel and spotlight for developer video.
 2014-02-08 18:34:44 +00:00
Katie McCormick
f2fcbff838 Merge "Doc update: misc GCM fixes" into klp-docs 2014-02-08 01:55:44 +00:00
Katie McCormick
63b2b8cbf8 Doc update: misc GCM fixes 
Fixes for:

b/12909231
b/12887320
b/12872407

Change-Id: I1fefb41f7ceea2e4e80262834d1c631b6b8daf7e
 2014-02-07 17:43:22 -08:00
Dirk Dougherty
392ddb2297 Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 2014-02-07 20:50:25 +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
Dirk Dougherty
13d79ce5b3 Doc change: add carousel and spotlight for developer video. 
Change-Id: I715e559c880bb76939ba1a423c3927aacc16e2a1
 2014-02-06 15:04:08 -08:00
Ricardo Cervera
1d2b0c008b am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'adb940131adf137023006fcd86663fd048fa6a54':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:29:59 +00:00
Ricardo Cervera
6232c3caf5 am a5e35cb0: am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'a5e35cb002936291b79ff422c94eb2caabedfb3a':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:26:03 +00:00
Ricardo Cervera
adb940131a am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8ff1f285c93a1a44a7419ab216bee2f92518387a':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:23:40 +00:00
Ricardo Cervera
a5e35cb002 am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '6ed268623b9e4a10a080e15d64340c16d2dd8a28':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:19:50 +00:00
Ricardo Cervera
b7d456d4a4 am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:17:12 +00:00
Ricardo Cervera
74d290fd62 am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'd057fa6d40198e07844f702608b7959bad3bd48b':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:13:21 +00:00
Ricardo Cervera
8756b0c3ce Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 2014-02-06 21:09:12 +00:00
Ricardo Cervera
531939d151 Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 2014-02-06 21:07:09 +00:00
Ricardo Cervera
893ee42c72 docs: Updated the retaining an object during conf change. Bug: 10303533 
Replaced use of deprecated methods with retained fragments.

Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
 2014-02-06 10:57:36 -08:00
Ricardo Cervera
56d37fb8cd docs: Fixed links to Proguard manual. Bug: 12713887 
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.

Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html

Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
 2014-02-06 09:49:04 -08:00
Stephen Hines
278a561925 am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit '34b84e691c4d5bd853bc5b7c7ccb8040590359d6':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:09:21 +00:00
Stephen Hines
34b84e691c am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:00:43 +00:00
Scott Main
45d1cc587b am 35a25455: am 70f908d7: am 3e80914d: am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit '35a254554787196cf835536cc3bc28f9ee890af4':
  dashbaord update for feb '14
 2014-02-04 19:33:26 +00:00
Scott Main
3e80914d16 am eea15edc: am 749120f3: dashbaord update for feb \'14 
* commit 'eea15edcd47e6830dd6cdecb2c0b1e26eba0e6e3':
  dashbaord update for feb '14
 2014-02-04 19:19:38 +00:00
Glenn Kasten
c734de9c2b am 9d2ad121: am 830d4ffc: am 74dc4bd0: am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '9d2ad12181a1793686d7cdbdf11b3aa5a92030c4':
  Add adb over Wi-Fi
 2014-02-04 19:02:57 +00:00
Scott Main
749120f39b dashbaord update for feb '14 
Change-Id: I7ed66b6603f40cbbf3ffcc4824894777e3f8add2
 2014-02-04 10:57:47 -08:00
Glenn Kasten
74dc4bd09e am 983a9381: am 11263b24: Merge "Add adb over Wi-Fi" into klp-docs 
* commit '983a9381b87519ddd1c6e12e44a8762dc805894a':
  Add adb over Wi-Fi
 2014-02-04 18:32:10 +00:00
Glenn Kasten
11263b2423 Merge "Add adb over Wi-Fi" into klp-docs 2014-02-04 18:27:13 +00:00
Ricardo Cervera
2a1fdefe16 am 1441acdd: am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit '1441acdd6d0f08b00493478386e1b74df47e243b':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:35:37 +00:00
Ricardo Cervera
f7c12817dc am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 
* commit 'b180bff575b25ab6b692327a3be244310fd90c5e':
  docs: Added note on multiple build.gradle files. Bug: 12870006
 2014-02-04 17:24:28 +00:00
Ricardo Cervera
ccec0906bd Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs 2014-02-04 17:18:59 +00:00
Scott Main
80ddc85515 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d

Conflicts:
	docs/html/tools/samples/index.jd
 2014-02-04 08:57:20 -08:00
Scott Main
a7f84f3bd4 am 28a828fa: am 56783a74: remove samples page under tools. redirect in separate cl. bug: 12878293 
* commit '28a828fa198122a13d053eae2e46f18487818e91':
  remove samples page under tools. redirect in separate cl. bug: 12878293
 2014-02-04 02:06:01 +00:00
Ricardo Cervera
641fc0f751 docs: Added note on multiple build.gradle files. Bug: 12870006 
Change-Id: I44b5152dc753893d3b9f0a0441066a530e5a30f0
Review: http://quixote.mtv.corp.google.com:8006/google/play-services/setup.html
 2014-02-03 17:08:31 -08:00
Scott Main
56783a7424 remove samples page under tools. redirect in separate cl. 
bug: 12878293

Change-Id: I51b0946d5d408ba92b3ae6fdfad8f14209cdbd5d
 2014-02-03 17:07:27 -08:00
Glenn Kasten
77c86261ee Add adb over Wi-Fi 
Change-Id: I6ada6c88e3a006abc4685b66d6decd1bec175941
 2014-02-03 16:49:34 -08:00
Scott Main
ca821336bd am 53959634: am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit '53959634b35ab75ef40ac4514d50bae2de9425ac':
  Revert "add Cast to the sidenav"
 2014-01-31 08:12:30 +00:00
Scott Main
8d1a52c832 am a749593d: am 04022e50: am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit 'a749593dd64f6d8f8d5d5e6addd16699258e9130':
  Revert "add google cast feature page"
 2014-01-31 08:12:25 +00:00
Quddus Chong
5e5d04b468 am 7ce575a5: am bcf8faa6: am f29e2589: am 583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs 
* commit '7ce575a5257328ce089d6eaa39eb493eafbd473c':
  Revert "docs: Added API reference docs for GCore Iberico release."
 2014-01-31 08:12:20 +00:00
Stephen Hines
7f75eaa218 Add message to RS docs about application vs. library packaging. 
Change-Id: I49b694629ded066e5ee9c1af29970c59cb637fdd
 2014-01-30 19:43:20 -08:00
Scott Main
40a7e3c425 am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs 
* commit 'e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
  Revert "add Cast to the sidenav"
 2014-01-30 22:10:50 +00:00
Scott Main
04022e5077 am 4b1a317a: am 428ccea5: Merge "Revert "add google cast feature page"" into klp-docs 
* commit '4b1a317abb56dc90efacf86ccd796643b1f02478':
  Revert "add google cast feature page"
 2014-01-30 22:10:45 +00:00
Scott Main
897739f1b7 Merge "Revert "add Cast to the sidenav"" into klp-docs 2014-01-30 21:27:26 +00:00
Scott Main
1ff3e4fffc Revert "add Cast to the sidenav" 
This reverts commit 3781318fefba28699e7713b231c9591bf29eadac.

Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
 2014-01-30 21:27:06 +00:00
Scott Main
428ccea509 Merge "Revert "add google cast feature page"" into klp-docs 2014-01-30 21:24:45 +00:00