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

5262 Commits

Author SHA1 Message Date
quddusc
a0b259a917 am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit '161e423ead0e2272ebb0b73957abf0c916ad57ff':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:09:45 -07:00
quddusc
161e423ead Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 2013-09-09 20:22:55 +00:00
Dirk Dougherty
b096bee155 am dd93ae32: Doc change: fix typo. 
* commit 'dd93ae32a8d50147a95a270cc99f9474dbf9ee27':
  Doc change: fix typo.
 2013-09-09 10:42:47 -07:00
Dirk Dougherty
dd93ae32a8 Doc change: fix typo. 
Change-Id: Idd14111f1b62430560a11c5803a864f2bad5eff0
 2013-09-09 10:36:37 -07:00
quddusc
5a5df7f936 docs: Fixed deprecated value. 
Bug: 10641906

Change-Id: I1e89e031292fb225f67c7f8a06924f29a9e950b2
 2013-09-06 13:53:11 -07:00
Scott Main
966b9d467d am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '002057bf0452168fd88eb81c2d36f02cfb260769':
  update dashboards for 9/13
 2013-09-04 15:36:59 -07:00
Scott Main
002057bf04 Merge "update dashboards for 9/13" into jb-mr2-docs 2013-09-04 22:35:04 +00:00
Scott Main
847480c6d1 update dashboards for 9/13 
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
 2013-09-04 15:08:40 -07:00
Scott Main
ca0d88b841 am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'c3adcf9dc745932bf3a059a7201644dd96b97750':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:18:23 -07:00
Scott Main
c3adcf9dc7 Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 2013-09-04 16:15:00 +00:00
Dirk Dougherty
c236f99234 am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit '5e52ee6ecf08b299b433104798e736e2bc3904d5':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:44:24 -07:00
Dirk Dougherty
5e52ee6ecf Doc change: small refinement of brand usage guidelines. 
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
 2013-09-03 11:32:09 -07:00
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
Scott Main
bb6b1ff012 am d608d5e3: add jb mr2 uses-feature items to reference page and fix a couple doc bugs 
* commit 'd608d5e3fa08cd9935f03144b192ea5934c715a8':
  add jb mr2 uses-feature items to reference page and fix a couple doc bugs
 2013-08-26 13:09:46 -07:00
Scott Main
d608d5e3fa add jb mr2 uses-feature items to reference page and fix a couple doc bugs 
Change-Id: I1b95d98b083af3dad55f19a9e68f69460d4e6e57
 2013-08-26 12:49:39 -07:00
Dirk Dougherty
be2f72a187 am 2c30fe8a: Doc change: fix typo in policy docs. 
* commit '2c30fe8aedc5af2845e97b9005d6dce570f9d8eb':
  Doc change: fix typo in policy docs.
 2013-08-23 15:45:53 -07:00
Dirk Dougherty
2c30fe8aed Doc change: fix typo in policy docs. 
Change-Id: Ic9df2511f50d9ead2dcbf4353f387e9106ce4222
 2013-08-23 11:31:29 -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
80bd95bf86 Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs 2013-08-23 17:13:05 +00:00
Dirk Dougherty
3d205ab01e Doc change: update Google Play policies descriptions. 
Change-Id: I4ebc985159db5f24632bac38cff63c7b663794b8
 2013-08-23 10:11:44 -07:00
Scott Main
cd4e1c463e am f151391b: fix markup errors in action bar styling, add more information about using drawables, move \'managing the activity lifecycle\' down a notch, because it\'s less interesting. 
* commit 'f151391b72b5ab667ea0681de5bd2fbe0d94d8a9':
  fix markup errors in action bar styling, add more information about using drawables, move 'managing the activity lifecycle' down a notch, because it's less interesting.
 2013-08-22 18:54:35 -07:00
Scott Main
f151391b72 fix markup errors in action bar styling, 
add more information about using drawables,
move 'managing the activity lifecycle' down a notch, because it's less interesting.

Change-Id: I75012207bfaa499ca881ec5cc3a94e8d66addbad
 2013-08-22 18:44:44 -07:00
Scott Main
f5e0970c47 replace instances of Wi-Fi Direct with Wi-Fi P2P 
Change-Id: I21cb06e27e98c428b4f3f4ac72e759f61607e468
 2013-08-22 17:41:10 -07:00
Scott Main
1b3f1533ce am 414905b7: update samples nav for new script 
* commit '414905b7044b10b7231f13584bf26e7c8c3e1e12':
  update samples nav for new script
 2013-08-20 17:17:34 -07:00
Scott Main
414905b704 update samples nav for new script 
Change-Id: I4b357f1edf2d8e3eb7b3810103c60d3fd470e113
 2013-08-20 17:07:05 -07:00
Joe Fernandez
d1037efe7e am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs 
* commit '9d237204da9b000c5debfa1f5650d13a545bb7c8':
  Android 4.3 Platform Google APIs r2 system image Release Notes
 2013-08-19 16:49:44 -07:00
Joe Fernandez
9d237204da Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs 2013-08-19 23:47:24 +00:00
Joe Fernandez
312d29ed3d Android 4.3 Platform Google APIs r2 system image Release Notes 
Google APIs System image update with Google Play Services 3.2.25

Change-Id: Iac6987a9dcb55bd971da9ca57c5a5dae0c357be5
 2013-08-19 16:43:57 -07:00
Dirk Dougherty
364fe3a856 am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters. 
* commit 'b6bc020d728960dc876a510c9e40cc441a9a9b6b':
  doc change: Samples browsing first changes: Samples dir and file starters.
 2013-08-19 12:09:45 -07:00
Dirk Dougherty
b6bc020d72 doc change: Samples browsing first changes: Samples dir and file starters. 
Change-Id: I6cc8c03bf4c2bcc771d4531619db5b3acd62601f
 2013-08-19 11:19:38 -07:00
Scott Main
8f5a76d2bf am b4f96287: add latest Roboto fonts to DAC and update download links 
* commit 'b4f96287285cd0886954d1576157b7a38995af88':
  add latest Roboto fonts to DAC and update download links
 2013-08-16 10:55:07 -07:00
Scott Main
b4f9628728 add latest Roboto fonts to DAC and update download links 
Change-Id: I6232cf02486d5b82d503ebe8c6035a7da2a1093d
 2013-08-16 10:41:31 -07:00
Roman Nurik
8ab80f1a02 am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit '1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66':
  Update Typography design guide Bug: 6947941
 2013-08-14 11:21:45 -07:00
Roman Nurik
1a5bb9d5cf Update Typography design guide 
Bug: 6947941

Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
 2013-08-14 10:48:26 -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
Joe Malin
5986f49751 Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs 2013-08-08 17:12:02 +00:00
Joe Malin
81ea1eed82 Doc Change: Fix 10224981 error in code snippet 
Change-Id: Ia8193989b0ab08f5b0888a4d3f6823018b48ab18
 2013-08-07 16:43:52 -07:00
Joe Malin
6180f104cf DOC CHANGE: Fixed bug 10210178 
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
 2013-08-07 09:53:09 -07:00
Scott Main
7b60431ba0 update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. 
bug: 10207619

Change-Id: Ia94b102f3c1476eb118c212de3246e735ffe57b6
 2013-08-06 13:17:41 -07:00
Dirk Dougherty
4e847bd1f0 Doc change: fix federated urls. 
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
 2013-08-06 10:01:24 -07:00
Dirk Dougherty
58c68d7759 Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 2013-08-06 07:35:28 +00:00