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

347 Commits

Author SHA1 Message Date
quddusc
40765a4a53 am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
* commit '2ef3952d8e62b71baca176b3e17315a37facd34a':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
 2013-08-29 11:12:44 -07:00
quddusc
2ef3952d8e cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
 2013-08-29 10:52:49 -07:00
Dirk Dougherty
6d3fbd0073 am 8236443b: Doc change: update spam policy image. 
* commit '8236443bdac2ba7c7630ddcc4ce9a18a03fe31a1':
  Doc change: update spam policy image.
 2013-08-28 11:42:05 -07:00
Dirk Dougherty
8236443bda Doc change: update spam policy image. 
Change-Id: Ib19ea838f0f72725cedf2cea8aff505ccc477a45
 2013-08-28 11:37:05 -07:00
Dirk Dougherty
1b6d199009 am 80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs 
* commit '80bd95bf86e43e5bbca6a08ede708524e5024a1c':
  Doc change: update Google Play policies descriptions.
 2013-08-23 10:15:42 -07:00
Dirk Dougherty
3d205ab01e Doc change: update Google Play policies descriptions. 
Change-Id: I4ebc985159db5f24632bac38cff63c7b663794b8
 2013-08-23 10:11:44 -07:00
Scott Main
261e00cb04 am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 10:57:31 -07:00
Katie McCormick
e78b4f5339 Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-12 12:07:26 -07:00
Scott Main
6dd38cc534 Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." 
Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
 2013-08-12 17:40:37 +00:00
Scott Main
ebcee19783 Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" 
revert to fix conflicts, i'll fix it all later.

This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.

Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
 2013-08-12 17:08:28 +00:00
Scott Main
b478b10f34 Revert "Doc change: collapse key fix." 
To resolve conflict. I'll fix it all later.

This reverts commit 53d9628d080aa7339b724a994607022c5386a566.
 2013-08-12 09:57:24 -07:00
Katie McCormick
385bb2eb51 resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev 
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
 2013-08-09 17:55:05 -07:00
Katie McCormick
53d9628d08 Doc change: collapse key fix. 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-09 15:32:23 -07:00
Scott Main
d041301adb new class on using action bar for training basics 
Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
 2013-08-01 14:56:00 -07:00
Dirk Dougherty
446322323c Doc change: add gpg developer stories. 
Change-Id: I3066019e7dc341e48c681f6e3089df334b9739a1
(cherry picked from commit 1698800c66b7c97f19ce8777dc79e7047f77e38f)
 2013-07-26 19:55:39 +00:00
Joe Fernandez
21a1df23cd Merge "docs: Support Library Guide" into jb-mr2-ub-dev 2013-07-24 06:13:38 +00:00
Dirk Dougherty
3ab0470cf1 Doc change: Platform highlights for Android 4.3. 
Change-Id: If178b8268d4d703d06266cb3adc0c124e596378c
 2013-07-23 21:37:56 -07:00
Joe Fernandez
5ffbba6455 docs: Support Library Guide 
Extending the Support Library documentation to explain how to
support mainstream features such as ActionBar across multiple
versions of Android.

Change-Id: I8ddeeb912884a39b2fb8717129d22993102ef650
 2013-07-23 21:26:49 -07:00
Scott Main
3dee8aaf17 Merge "update action bar guide for support lib ABC" into jb-mr2-dev 2013-07-23 20:21:13 +00:00
Scott Main
e04c454302 update action bar guide for support lib ABC 
Change-Id: Ie4594b3a0e0a686ed37d858788c7c747a1ee09e0
 2013-07-23 12:17:05 -07:00
Dirk Dougherty
e0380d8fe6 resolved conflics for merge of 54201120 to jb-mr2-dev 
Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa
 2013-07-17 18:44:03 -07:00
Dirk Dougherty
5420112070 am 7eae1ef0: am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight. 
* commit '7eae1ef0d972911d8225de6aeebf33b806ec7037':
  Doc change: Add Colopl video to carousel and spotlight.
 2013-07-17 18:19:38 -07:00
Dirk Dougherty
c7e4be8abd Doc change: Add Colopl video to carousel and spotlight. 
Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
 2013-07-17 18:00:35 -07:00
Scott Main
57b0fed7a9 am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:44:58 -07:00
Scott Main
603c3d8a9a am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:42:47 -07:00
Scott Main
276f0ce4df update Android Studio for v0.2.0. 
add release notes and troubleshooting topics

Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
 2013-07-11 16:22:21 -07:00
Dirk Dougherty
6561c27519 am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '6755a4d433d44506abd932b62f6552fa37bf1dd9':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:45:02 -07:00
Dirk Dougherty
6755a4d433 am 757b943a: am b2e3fb4f: am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '757b943a92d23c255dcca15944908f105265a86b':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:42:58 -07:00
Dirk Dougherty
b2e3fb4f37 am 9db29158: am f812258e: Doc change: add docs for edu opt-in. 
* commit '9db291583a90babbcb6db6f2b82276f5657a3503':
  Doc change: add docs for edu opt-in.
 2013-06-23 19:39:30 -07:00
Dirk Dougherty
f812258e5c Doc change: add docs for edu opt-in. 
Change-Id: Ieb9f77e3efd64c42c719167dd6e6c6d7360bcfa4
 2013-06-23 19:33:00 -07:00
Scott Main
4129cfe1e4 Merge "add jb-mr2 api overview" into jb-mr2-dev 2013-06-22 03:23:50 +00:00
Scott Main
8cc7db7d40 add jb-mr2 api overview 
Change-Id: Ib46c3ad3318d19927f47f1bb0ada93adf7766147
 2013-06-21 20:20:40 -07:00
Scott Main
fbba76fe21 am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev 
* commit '20eac772f32e3b40959a8fb7c64565aad94b8054':
  add Arabic Google Play badges to generator bug: 7994508
 2013-06-21 10:38:37 -07:00
Scott Main
20eac772f3 am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev 
* commit '334dadec751b2e51ff8a98498f02430b765aa091':
  add Arabic Google Play badges to generator bug: 7994508
 2013-06-18 15:31:37 -07:00
Scott Main
763bca7bf5 add Arabic Google Play badges to generator 
bug: 7994508

Change-Id: Ic9fa9e69ca3c8015f717455176aa7460a5ea5f16
 2013-06-18 15:19:52 -07:00
Scott Main
369994da27 am 8cf04a40: am efbcdcd1: am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit '8cf04a40b9776776db835bede661f6103db078d0':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:21:56 -07:00
Scott Main
8cf04a40b9 am efbcdcd1: am 248573b8: update homepage banner for videos to point to new io13 video channel 
* commit 'efbcdcd15e8dac9f8ed16c5ec0f00c8c56dc4974':
  update homepage banner for videos to point to new io13 video channel
 2013-05-29 15:19:25 -07:00
Scott Main
248573b858 update homepage banner for videos to point to new io13 video channel 
Change-Id: Ibdf384a3e3e0e082c3d4118efde3ecc69a206fa3
 2013-05-29 12:27:09 -07:00
Scott Main
412633baa0 am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit '2cca8962327b2d988bf5172e4142268fa3795b57':
  update video playlists and marquee announcements
 2013-05-20 12:33:00 -07:00
Scott Main
2cca896232 am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f657689ab5b7d46e5f3c9dd376c0cb89479a1075':
  update video playlists and marquee announcements
 2013-05-20 12:30:38 -07:00
Scott Main
9994769f42 update video playlists and marquee announcements 
Change-Id: I853a30370bb79d3f392da11e24358c15d42005e5
 2013-05-20 12:23:58 -07:00
Dirk Dougherty
0163a18051 am 8f13a2ad: am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content. 
* commit '8f13a2ad9f68ddb10388e86104868311e5ee2e29':
  Doc change: add files for edu content.
 2013-05-15 05:35:25 -07:00
Dirk Dougherty
8f13a2ad9f am c3727b78: am 260f110f: am 7929aafe: am 6402d93e: Doc change: add files for edu content. 
* commit 'c3727b78faf23f84a4888d96a0e21716ac0cecb7':
  Doc change: add files for edu content.
 2013-05-15 05:28:14 -07:00
Dirk Dougherty
6402d93ed8 Doc change: add files for edu content. 
Change-Id: I5187958d5bbbdd1117df5bcc9b553c06323fef8d
 2013-05-15 04:17:19 -07:00
Scott Main
2ae4ee6a32 am 38922807: am 4a945f3f: am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs 
* commit '389228074a69cd42f97620e7a4bddc87f65a0c84':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
 2013-05-15 01:26:57 -07:00
Scott Main
389228074a am 4a945f3f: am 0408ef96: am 8d254bd3: am c06cbc3d: Merge "add docs for new IDE installing guide, migration guide, tips docs, and download page" into jb-mr1.1-docs 
* commit '4a945f3f4d230520b55f08e813bf1d8b0b139713':
  add docs for new IDE installing guide, migration guide, tips docs, and download page
 2013-05-15 01:24:39 -07:00
Scott Main
441e8b9f95 add docs for new IDE 
installing guide, migration guide, tips docs, and download page

Change-Id: Ia884c95a20de28863a80ba1e985841a44e5e453c
 2013-05-15 00:42:35 -07:00
Dirk Dougherty
e3179ebc38 am 44eeb9cd: am 417472b2: am 96dcfd00: am e9331223: am 23a87b23: Doc change: a new image for play services location landing. 
* commit '44eeb9cd11085ad0a4e3dd48836e507dca021fea':
  Doc change: a new image for play services location landing.
 2013-05-14 00:15:13 -07:00
Dirk Dougherty
44eeb9cd11 am 417472b2: am 96dcfd00: am e9331223: am 23a87b23: Doc change: a new image for play services location landing. 
* commit '417472b220744056a015d2435f85228ce49f2350':
  Doc change: a new image for play services location landing.
 2013-05-14 00:12:54 -07:00
Dirk Dougherty
23a87b2390 Doc change: a new image for play services location landing. 
Change-Id: If66a0272fedebbc0191e966938d2cc50e4758bb6
 2013-05-13 23:59:20 -07:00