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

5574 Commits

Author SHA1 Message Date
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
Joe Fernandez
ab1f29d935 docs: OpenGL Training sample code fixes 
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit 6da22f88434543e8796e0151f4bb11d74c16e847)
 2013-08-02 20:57:03 +00:00
Scott Main
d53f8abcf5 add note to use "480" instead of "xxhdpi" (this should be temporary) 
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
 2013-08-02 12:56:43 -07:00
Dirk Dougherty
882ecced5e Doc change: refresh GCM reference docs. 
Change-Id: I4f79e27b9d761cb8967fb90ff8df5438e43cd39c
 2013-08-01 16:15:21 -07:00
Scott Main
a5da186523 am 9210aea5: am 218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs 
* commit '9210aea5accb872527ba1d54ba0760340ad8f1ba':
  dashboard update for 8/1
 2013-08-01 15:58:53 -07:00
Scott Main
218120e079 Merge "dashboard update for 8/1" into jb-mr2-docs 2013-08-01 22:54:06 +00:00
Scott Main
bf03f391ba dashboard update for 8/1 
Change-Id: I8541646e13d20186f79dd8a548b1ff21602793b6
 2013-08-01 15:49:20 -07:00
Scott Main
54403d8a27 am f5ad5b26: am 8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs 
* commit 'f5ad5b2635d0a46c9a3e09543431a73e915ba4c6':
  update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221
 2013-08-01 15:42:54 -07:00
Scott Main
8709fb2a71 Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs 2013-08-01 22:36:03 +00:00
Dirk Dougherty
c1609c4163 Doc change: Updated reference docs for Google Play Services 3.2. 
Change-Id: I784e7a16b92f1d122211024fbdb261c06b804376
 2013-08-01 15:30:06 -07:00
Scott Main
eb461f9e5b am 0e687767: am f0e0cf4e: fix toc link 
* commit '0e6877678665eed45be77a8aa118a67f95e55c9e':
  fix toc link
 2013-08-01 15:25:55 -07:00
Scott Main
fca04b8731 am 3db57cf1: am c4c7463f: add note about VideoView "wrap_content" layout issue bug: 9364101 
* commit '3db57cf19d59d1ed39d531137f6fd698befbb348':
  add note about VideoView "wrap_content" layout issue bug: 9364101
 2013-08-01 15:20:24 -07:00
Scott Main
f0e0cf4e0d fix toc link 
Change-Id: If2509e23db7f4f189f7521846598424cff2c2882
 2013-08-01 15:13:06 -07:00
Scott Main
eb22128596 am fba14236: am 4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs 
* commit 'fba1423687f24063e87439b0ae26a12882bb4780':
  new class on using action bar for training basics
 2013-08-01 15:03:36 -07:00
Scott Main
c4c7463f54 add note about VideoView "wrap_content" layout issue 
bug: 9364101

Change-Id: I21881b30f338e9cdd7ffaa509edcf71e9478ded5
 2013-08-01 15:02:15 -07:00
Scott Main
4633a50b6d Merge "new class on using action bar for training basics" into jb-mr2-docs 2013-08-01 21:58:57 +00: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
3ba6747b3c am 31bd3350: am f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs 
* commit '31bd33507bea5c4c2f3f8c6bf30bfb01daa998fd':
  Doc Update: Delete this unpublished cruft.
 2013-08-01 14:48:54 -07:00