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

6587 Commits

Author SHA1 Message Date
quddusc
23846c6380 am 45f232cf: am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '45f232cf579a1b4f8e32da08f17b7b7eb20ddc18':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 23:36:13 +00:00
Katie McCormick
0b09a76624 am 2aa70413: am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '2aa704133a914f4a8455862d74cc450b267f1b9a':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 23:36:08 +00:00
quddusc
45f232cf57 am 7ba3b3f4: am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit '7ba3b3f4c87d891a2e8b55f68efd169392ff62af':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 18:34:31 +00:00
Katie McCormick
2aa704133a am 76b66a9a: am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '76b66a9ae7a894dd30a3bab56dedb537a904157b':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 18:34:27 +00:00
quddusc
7ba3b3f4c8 am fe0996b7: am 60095240: docs: Updated the gradle build number to 4.3.23. Bug: 14043082 
* commit 'fe0996b7c09606fab0c1645d6c329cadf4d82841':
  docs: Updated the gradle build number to 4.3.23. Bug: 14043082
 2014-04-15 18:29:05 +00:00
Katie McCormick
76b66a9ae7 am 2b4d89b7: am eca07bfa: Merge "Doc change: Update CCS doc with new quota info." into klp-docs 
* commit '2b4d89b7dcea13140b64e887b2a36042e8d491e9':
  Doc change: Update CCS doc with new quota info.
 2014-04-15 18:28:59 +00:00
quddusc
60095240e2 docs: Updated the gradle build number to 4.3.23. 
Bug: 14043082

Change-Id: I8068f34b2533631b16dbaeaae3a0465088cc5aaf
 2014-04-15 16:57:40 +00:00
Katie McCormick
eca07bfaaf Merge "Doc change: Update CCS doc with new quota info." into klp-docs 2014-04-15 16:52:44 +00:00
Robert Ly
b4590b4550 resolved conflicts for merge of 99c3605c to master 
Change-Id: I9da7fcad19c3fe85fddb61c5c58b1482417d461a
 2014-04-15 09:14:19 -07:00
quddusc
99c3605c1d am 66e99c46: am 0bd51600: am 41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553 
* commit '66e99c46546bf34fb8806dbefdbd71df1d41c814':
  docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
 2014-04-14 22:56:44 +00:00
quddusc
66e99c4654 am 0bd51600: am 41fb2be0: docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553 
* commit '0bd516001988517aade19feb087de5cb03820805':
  docs: Updated name of API to "Google Maps Android API v2". Bug: 13666553
 2014-04-14 22:51:45 +00:00
Katie McCormick
b642f672f0 Doc change: Update CCS doc with new quota info. 
Fix for:

b/12665669

Change-Id: I08f812d37ab6f4347f6401b3a9682c45d96adb81
 2014-04-14 15:05:02 -07:00
quddusc
41fb2be0f2 docs: Updated name of API to "Google Maps Android API v2". 
Bug: 13666553

Change-Id: I6de26da064fcda4a64e29d35c7d75140c5a4e048
 2014-04-14 11:57:33 -07:00
Ricardo Cervera
dec50073c9 am 8490cc15: am 3d9a3b58: am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '8490cc15e5b948162feafd808e3c94a3d13bac57':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:21:28 +00:00
Ricardo Cervera
0504d2fa94 am 80790fe0: am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit '80790fe0e71d6fb4b34a311062244d16d0d9c07a':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:21:22 +00:00
Ricardo Cervera
8490cc15e5 am 3d9a3b58: am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '3d9a3b589af661f980a7c03f208915b54521639f':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:19:09 +00:00
Ricardo Cervera
80790fe0e7 am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit '7186228ae8505c3222be81680811d00de9bbdb6d':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:19:06 +00:00
Ricardo Cervera
3d9a3b589a am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '7abc67f43fff9d2dc84d1bddfb3e5b3a04fbc30a':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:14:23 +00:00
Ricardo Cervera
7186228ae8 am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit 'd1f51fda68ee23aaa83db62b32ad2b65d7fb4320':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:14:17 +00:00
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
e49ba1a3fc am f403d60f: am 17878a9a: 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 'f403d60fc8dfe2b833a65b6933a07c44d849e831':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:45:01 +00:00
quddusc
f403d60fc8 am 17878a9a: 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 '17878a9ab5c58f5b245bbdd0e8e16abbcde4a995':
  docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
 2014-04-05 22:38:52 +00: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
6652b98339 am de4fedef: am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit 'de4fedefbf4772e15bb9aa95458fd2f314cdb502':
  Doc Update: notification bug fix.
 2014-04-04 21:41:49 +00:00
Katie McCormick
de4fedefbf am 8e63696a: am f7bffe77: am fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs 
* commit '8e63696a73dfebae9b2ec123611db6b21968dbfd':
  Doc Update: notification bug fix.
 2014-04-04 21:35:50 +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
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:34:11 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:28:09 +00: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
d09e5606a5 am 1ac6519b: am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit '1ac6519b245c008ea6b3b6baba205fb58d75c807':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:46:28 +00:00
Ricardo Cervera
1ac6519b24 am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs 
* commit 'c31bd52df22dabf52b50e1377878548607d1f07b':
  docs: Fixed action bar example. Bug: 13806963
 2014-04-04 17:39:39 +00: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
ce16215d7b am c6d4a464: am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit 'c6d4a4647074e7d9f4882e54637567103108c0e3':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:14:16 +00:00
Ricardo Cervera
c6d4a46470 am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs 
* commit '13d49e9f364965169f933bcad6bcaeeb2f29fade':
  docs: Updated the link to buy a Nexus phone. Bug: 13671312
 2014-04-04 17:07:43 +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
2d65aad4fb am 957428dc: am 8866eb81: am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit '957428dcc55456077b28f2ff3190ec39844e6eee':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:42:49 +00:00
Ricardo Cervera
957428dcc5 am 8866eb81: am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
* commit '8866eb8155a40559c4ee0927764aa4c32e9a9cd2':
  docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
 2014-04-04 16:36:32 +00: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
62b7e66e03 am 035a2bbd: am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit '035a2bbd8b8720673e068cf06d646e616a10ab34':
  docs: MediaRouteProvider Developer Guide
 2014-04-03 01:41:20 +00:00
Katie McCormick
035a2bbd8b am 85588d19: am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit '85588d19bd9fce3d7e837c14e0b9d50cf3a75904':
  docs: MediaRouteProvider Developer Guide
 2014-04-02 23:17:20 +00:00