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

6477 Commits

Author SHA1 Message Date
Ricardo Cervera
2abf55ca9b Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 2014-04-11 16:07:48 +00:00
Ricardo Cervera
a765e78241 Merge "docs: Added a document on debugging in Android Studio" into klp-docs 2014-04-11 16:06:23 +00:00
Ricardo Cervera
629c34ee18 docs: Added a document on debugging in Android Studio 
Change-Id: I073e1db6d7976db0f658aac4aa377877ed931aa2
 2014-04-10 11:09:24 -07:00
quddusc
17878a9ab5 am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:32:35 +00:00
quddusc
7db3875cdc Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs 2014-04-05 22:23:36 +00:00
Katie McCormick
8e63696a73 am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'f7bffe7707f31da920a8ff08d013934562e9a43d':
  Doc Update: notification bug fix.
 2014-04-04 21:31:28 +00:00
Katie McCormick
fc8ea92df1 Merge "Doc Update: notification bug fix." into klp-docs 2014-04-04 21:12:16 +00:00
Katie McCormick
507c9fd016 Doc Update: notification bug fix. 
Fixes:

b/13429906

Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
 2014-04-04 14:07:35 -07:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Ricardo Cervera
c31bd52df2 am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit 'a821af684e2a5f814fc8709518b5f0589c81661e':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:32:42 +00:00
Ricardo Cervera
715139a620 Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 2014-04-04 17:23:09 +00:00
Ricardo Cervera
13d49e9f36 am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit 'e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:01:35 +00:00
Ricardo Cervera
6ae21ea7fb Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 2014-04-04 16:51:20 +00:00
Ricardo Cervera
7f427b45bd docs: Fixed action bar example. Bug: 13806963 
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
 2014-04-04 09:46:11 -07:00
Ricardo Cervera
8866eb8155 am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit 'c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:30:02 +00:00
Ricardo Cervera
07aac5e346 docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
Change-Id: Ibf718f6051aabaf1120d4245ffc870fa928138be
 2014-04-03 18:04:41 -07:00
Katie McCormick
85588d19bd am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit 'cd536cb32927d74ac8181c8636f2971cb39e7fda':
  docs: MediaRouteProvider Developer Guide
 2014-04-02 23:11:20 +00:00
Katie McCormick
0cdf60472b Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 2014-04-02 22:58:57 +00:00
Joe Fernandez
55b38fadd0 docs: MediaRouteProvider Developer Guide 
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
 2014-04-02 15:35:15 -07:00
Ricardo Cervera
c013eaad57 am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 
* commit '5a218b186735534925d7fedb63f1c78a3a3ff543':
  docs: Added notes to use the last SDK version to the Build your First App class.
 2014-04-02 00:15:31 +00:00
Ricardo Cervera
8e183798d5 Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 2014-04-02 00:03:00 +00:00
quddusc
f425e5ea05 am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit 'c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:30:33 +00:00
quddusc
5321e9bd48 Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 2014-04-01 18:12:06 +00:00
Scott Main
c37960733a am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'c8b6feb2007259cdc4053a9774e31847ee60d592':
  laptop image with redacted
 2014-04-01 17:59:12 +00:00
Scott Main
3bd0a44bbf am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit 'a7afd38f3021a15e0bd22674409c2cd6d83095c3':
  dashbaord update for 4/1/14
 2014-04-01 17:59:08 +00:00
quddusc
f74a6cf388 docs: Fixed outdated link to Google Analytics docs. 
Bug: 13742301

Change-Id: Idb439a38299be808cd1cd1d317d67efe78f785cc
 2014-04-01 17:53:55 +00:00
Ricardo Cervera
bb755da9f7 am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio 
* commit 'c192cdd3c4ad8696d5d77949984cf7e06445e051':
  docs: Renamed the document on building with Android Studio
 2014-04-01 17:49:40 +00:00
Scott Main
356820063a Merge "laptop image with redacted" into klp-docs 2014-04-01 17:47:03 +00:00
Scott Main
1afdbb9344 Merge "dashbaord update for 4/1/14" into klp-docs 2014-04-01 17:46:37 +00:00
Ricardo Cervera
8e5775daae docs: Added notes to use the last SDK version to the Build your First App class. 
Change-Id: I35820ff887b3d0f4ccc0ce7720576e3e692109b5
 2014-04-01 10:46:16 -07:00
Scott Main
b0b84487c1 dashbaord update for 4/1/14 
Change-Id: Id38d8a448dc86afecc2e80dc6a5f4fdb26d7cc93
 2014-04-01 10:39:42 -07:00
Ricardo Cervera
cf96f81585 docs: Renamed the document on building with Android Studio 
Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
 2014-04-01 10:16:45 -07:00
Scott Main
bb55852daf laptop image with redacted 
Change-Id: I89e6b37840757a53c38686a2cf69297e558ef6d0
 2014-03-31 20:40:34 -07:00
Scott Main
adcb288e38 am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'b1088bfe8d321f299d92736102b573963315dc26':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:03:18 +00:00
Scott Main
b1088bfe8d Merge "update common intents guide to add calendar and alarms." into klp-docs 2014-03-31 21:47:45 +00:00
Ricardo Cervera
fe8b0eac93 docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147 
Change-Id: I0eaf8e757757da66ba1a6ce2b77cd709645219a1
 2014-03-28 13:56:04 -07:00
Ricardo Cervera
7abf5cdc95 docs: Updated the link to buy a Nexus phone. Bug: 13671312 
Change-Id: Ie16f3a86e58af8367e065d444c497fe4c920b2ed
 2014-03-28 10:15:24 -07:00
Scott Main
d27f82f92a am a3a4d466: am 83d6ae28: fix broken links 
* commit 'a3a4d46609ebb1470d24c7d77662a8b16440765c':
  fix broken links
 2014-03-28 03:23:18 +00:00
Scott Main
a3a4d46609 am 83d6ae28: fix broken links 
* commit '83d6ae2804e280bd1e0980faf4e3090d240eb5f5':
  fix broken links
 2014-03-28 03:15:10 +00:00
Scott Main
83d6ae2804 fix broken links 
Change-Id: I5964804c219ef02cd5f380bf752061ff7a022d61
 2014-03-27 20:07:48 -07:00
Scott Main
7b190e0f1d am 22b483ee: am bbaf11f4: update viewport variable with new underscore format 
* commit '22b483ee6e029dc9db4ae390b91c449b7977273d':
  update viewport variable with new underscore format
 2014-03-27 20:13:59 +00:00
Scott Main
22b483ee6e am bbaf11f4: update viewport variable with new underscore format 
* commit 'bbaf11f42152d03c26ec0dc02061dc93a1feb830':
  update viewport variable with new underscore format
 2014-03-27 20:08:17 +00:00
Scott Main
bbaf11f421 update viewport variable with new underscore format 
Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
 2014-03-27 13:01:56 -07:00
Scott Main
4243710bf8 am 89f4a546: am 0c933df6: fix bug in code snippet 
* commit '89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
  fix bug in code snippet
 2014-03-27 19:08:23 +00:00
Scott Main
89f4a5463b am 0c933df6: fix bug in code snippet 
* commit '0c933df6d09dfb3923e0891028c67249bc8887d5':
  fix bug in code snippet
 2014-03-27 19:02:33 +00:00
Scott Main
0c933df6d0 fix bug in code snippet 
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
 2014-03-27 11:53:38 -07:00
Scott Main
b5e754dd4d am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit '8ea583a71aef2f21f833c003a948ca7b1dc32915':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:24:46 +00:00
Scott Main
8ea583a71a am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 
* commit 'f9943d0ecf4d3360064a4cec0b1ffd6767db5612':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
 2014-03-27 09:15:18 +00:00
Scott Main
f9943d0ecf Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 2014-03-27 06:24:15 +00:00