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

5591 Commits

Author SHA1 Message Date
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
d17619f6df am cd4e1c46: 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 'cd4e1c463eab530657bead6e79efa3215924f1b0':
  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:58:56 -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
fdc3c0ef90 am 1b3f1533: am 414905b7: update samples nav for new script 
* commit '1b3f1533ce6b3799fb90b7d73e3bef3ddce4abce':
  update samples nav for new script
 2013-08-20 17:20:39 -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
cf3aff672c am d1037efe: am 9d237204: Merge "Android 4.3 Platform Google APIs r2 system image Release Notes" into jb-mr2-docs 
* commit 'd1037efe7edcc202c84cfd8a74c4593d1d03ea2d':
  Android 4.3 Platform Google APIs r2 system image Release Notes
 2013-08-19 16:53:00 -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
2d9ee70703 am 364fe3a8: am b6bc020d: doc change: Samples browsing first changes: Samples dir and file starters. 
* commit '364fe3a856e7bd0c0a35724c2f42d381d8616370':
  doc change: Samples browsing first changes: Samples dir and file starters.
 2013-08-19 12:12:05 -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
59616de7ea am 8f5a76d2: am b4f96287: add latest Roboto fonts to DAC and update download links 
* commit '8f5a76d2bf011a7ae72d4c6845ee41fb63b21698':
  add latest Roboto fonts to DAC and update download links
 2013-08-16 10:58:52 -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
30e9065c25 am 8ab80f1a: am 1a5bb9d5: Update Typography design guide Bug: 6947941 
* commit '8ab80f1a02874a3bc4d9ec1272536e17a888bf3c':
  Update Typography design guide Bug: 6947941
 2013-08-14 11:24:11 -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
9b97944858 am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit '261e00cb046db01b2bae9342f34ff99e99ada368':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 11:00:49 -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
cdf3455c50 am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later." 
* commit '6dd38cc5343106251c8d66ab11bb93550082e594':
  Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
 2013-08-12 10:44:44 -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
7466b998e6 am ebcee197: Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later. 
* commit 'ebcee19783c4fe5ba776353e95974383850a4685':
  Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later.
 2013-08-12 10:14:03 -07: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
94c529b8d1 am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev 
* commit '385bb2eb5184686c2d953fe4757522e61acb3392':
  Doc change: collapse key fix.
 2013-08-09 19:31:19 -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
bc8bb009ae am 93bb7bf2: am 5986f497: Merge "Doc Change: Fix 10224981 error in code snippet" into jb-mr2-docs 
* commit '93bb7bf22df96368392199997aa401eef2c12a9c':
  Doc Change: Fix 10224981 error in code snippet
 2013-08-08 10:20:40 -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
68091b9e10 am 72289702: am 6180f104: DOC CHANGE: Fixed bug 10210178 
* commit '72289702e5e134eb189a208aa6e2fb3edb041f7a':
  DOC CHANGE: Fixed bug 10210178
 2013-08-07 10:47:59 -07:00
Joe Malin
6180f104cf DOC CHANGE: Fixed bug 10210178 
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
 2013-08-07 09:53:09 -07:00
Scott Main
ef54f611c1 am bdf85de3: am 7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619 
* commit 'bdf85de3b81586aadce564cf9cad6f4c725a302e':
  update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
 2013-08-06 15:35:20 -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
ec99780637 am 1153eb46: am 4e847bd1: Doc change: fix federated urls. 
* commit '1153eb46b3aa0226f6d1eac7a196052bd5d818f0':
  Doc change: fix federated urls.
 2013-08-06 10:48:48 -07:00
Dirk Dougherty
4e847bd1f0 Doc change: fix federated urls. 
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
 2013-08-06 10:01:24 -07:00
Dirk Dougherty
c5663c9f7c am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 
* commit '8154d2932a3e4f9800eeff18da640fda7a169ec8':
  Doc change: Updated reference docs for Google Play Services 3.2.
 2013-08-06 09:32:56 -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
Dirk Dougherty
966dc871ca am 780795dc: am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit '780795dc198c05d5a1a181c58317dc6befec861d':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:41:05 -07:00
Scott Main
24a32c98a5 am e0a85960: am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit 'e0a8596020a10c1cf6347d89fea862d41629db04':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:41:02 -07:00
Dirk Dougherty
b6cb0437ef Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 2013-08-02 22:49:11 +00:00
Scott Main
9a0087f227 Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 2013-08-02 22:27:14 +00:00
Scott Main
efd288a261 am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:29:09 -07:00
Scott Main
1f19690322 Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 2013-08-02 21:23:55 +00:00