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

6936 Commits

Author SHA1 Message Date
Quddus Chong
11f069764b am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 
* commit '4b2b91d47c1430f3c69893466cf2b8b025876888':
  docs: Updated Javadoc for GMS Kenafa release.
 2014-05-19 21:02:57 +00:00
quddusc
9e58b46b56 am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs 
* commit 'f269e732bf76d7dc4b37f2ce023684b4fe691c60':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
 2014-05-19 20:58:49 +00:00
Quddus Chong
4b2b91d47c am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 
* commit '4706479326789b4b20cc370cdb28c7a0b4f09646':
  docs: Updated Javadoc for GMS Kenafa release.
 2014-05-19 20:58:41 +00:00
quddusc
728dbf8cc8 Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs 2014-05-19 20:52:05 +00:00
Quddus Chong
f4b6449515 Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 2014-05-19 20:51:39 +00:00
Dirk Dougherty
0208462f7c am f0029f64: am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit 'f0029f644aa9d52e6fc1ebca8bea86cd67742c0a':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 18:23:44 +00:00
Scott Rowe
5d520df856 am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit '7a940a49745f51425e60bfde38b8c0dab454ef8b':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:23:40 +00:00
Dirk Dougherty
f0029f644a am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit '94fb04547ca35c09409cfc6e3b930805acddc7d6':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 18:12:40 +00:00
Scott Rowe
7a940a4974 am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit '3d55247a3f8e488b13f7f467cbc70ac4864d2dd2':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:12:37 +00:00
Dirk Dougherty
94fb04547c am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit '4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 18:08:53 +00:00
Scott Rowe
3d55247a3f am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit 'a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:08:45 +00:00
Robert Ly
3257984e55 am dbf711ea: am e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev 
* commit 'dbf711ea88b01693db1974a3a6a346cff3da6daa':
  docs: updates for changes to notification APIs
 2014-05-19 18:03:19 +00:00
Robert Ly
dbf711ea88 am e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev 
* commit 'e5c9d8551b22c1708723b89e8e8d6f830168f292':
  docs: updates for changes to notification APIs
 2014-05-19 17:59:48 +00:00
Robert Ly
e5c9d8551b Merge "docs: updates for changes to notification APIs" into klp-modular-dev 2014-05-19 17:56:18 +00:00
Dirk Dougherty
c385b1e4be Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 2014-05-19 17:23:33 +00:00
Robert Ly
6cf59a3edb docs: updates for changes to notification APIs 
Change-Id: I8a016b0693e928eb864065bea1079be824987340
 2014-05-16 21:10:52 -07:00
Scott Rowe
6d05170a55 docs: b/14510382 ISO language code, add link 
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
 2014-05-16 22:33:12 +00:00
Quddus Chong
26ca3fa77b docs: Updated Javadoc for GMS Kenafa release. 
Change-Id: Id3b7853282e317c85d58a7d84657e59a0159961d
 2014-05-16 14:39:08 -07:00
Dirk Dougherty
d1afa68d03 Remove neg margin in wear css to resolve layout issue. 
Change-Id: I68cc26e55b8bf486a20ec9fa1de48e9caf505165
 2014-05-14 20:23:48 -07:00
Ricardo Cervera
e7db83426e am d850be5d: am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 
* commit 'd850be5d1491d255a64db9bc95334748e455c782':
  docs: Removed outdated troubleshooting guidelines for Android Studio
 2014-05-15 00:00:53 +00:00
Ricardo Cervera
d850be5d14 am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 
* commit '7c05fd850bfbbbe9139a958102494260b5e6dea2':
  docs: Removed outdated troubleshooting guidelines for Android Studio
 2014-05-14 23:57:12 +00:00
Ricardo Cervera
7c05fd850b am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 
* commit '59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
  docs: Removed outdated troubleshooting guidelines for Android Studio
 2014-05-14 23:53:20 +00:00
Ricardo Cervera
0e286ab1f0 Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 2014-05-14 22:44:57 +00:00
Dirk Dougherty
f8f018ba5c am ae4388f7: am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs 
* commit 'ae4388f794d3ba4087f65b528eba06d5015c9c9a':
  update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
 2014-05-14 21:54:27 +00:00
Dirk Dougherty
9a6672beb1 resolved conflices for merge of 93ccd1a2 to master 
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
 2014-05-14 14:50:13 -07:00
Dirk Dougherty
ae4388f794 am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs 
* commit '0f5822847ae3422d939a7959f6a25178fcc12232':
  update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
 2014-05-14 21:24:29 +00:00
Dirk Dougherty
93ccd1a2eb am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute. 
* commit '0540bc373c84b4ab590708cc9f79c95eeac5114c':
  Doc change: Updated content for distribute.
 2014-05-14 21:24:24 +00:00
Dirk Dougherty
0f5822847a am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs 
* commit '980a285b4c29254fd65b0426256918ae2b5eea85':
  update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
 2014-05-14 21:21:23 +00:00
Dirk Dougherty
0540bc373c am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute. 
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
  Doc change: Updated content for distribute.
 2014-05-14 21:21:15 +00:00
Dirk Dougherty
5eb99943d5 Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs 2014-05-14 21:16:31 +00:00
Dirk Dougherty
3506ac87c0 Doc change: Updated content for distribute. 
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
 2014-05-14 14:10:51 -07:00
Ricardo Cervera
3144fde70f am 4472b649: am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '4472b649f975f2ddf6450bfdfd8fd1eae7a92e46':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:45:22 +00:00
Ricardo Cervera
4472b649f9 am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '7ce3b5ef64b1a183b75279016e6fc4f65be8c933':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:40:01 +00:00
Ricardo Cervera
7ce3b5ef64 am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 
* commit '04c9d1932d8a4c0f646a51ce6674535bd77b6172':
  docs: Added release notes for Build Tools 19.1.0
 2014-05-13 17:34:49 +00:00
Ricardo Cervera
9d7cf82561 Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs 2014-05-13 17:24:49 +00:00
Ricardo Cervera
a7a55c1ef4 docs: Added release notes for Build Tools 19.1.0 
Change-Id: Icd162f7b1b7634b7b503d6d39a17fcb1c43a74c9
 2014-05-13 10:21:35 -07:00
Scott Main
1f367d988d update wear reference docs to support sticky nav. 
DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.

Change-Id: I829cd96ae0f36a31155adf8e80b6d965e9531c42
 2014-05-13 04:31:44 -07:00
Robert Ly
2448b44e68 am 0932eb35: am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '0932eb35ecdf02edeeedb6656cbf1fdc5288e518':
  docs: fix some notification code for wear stacks
 2014-05-10 03:14:21 +00:00
Robert Ly
0932eb35ec am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '8028e4a063b49aadfb08fab012d2388a7466a9a1':
  docs: fix some notification code for wear stacks
 2014-05-10 02:53:28 +00:00
Robert Ly
8028e4a063 am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '1f14c107f825a9a309b396f65fbfc92a4c57eb3d':
  docs: fix some notification code for wear stacks
 2014-05-10 02:48:57 +00:00
Robert Ly
0689fad8cc Merge "docs: fix some notification code for wear stacks" into klp-docs 2014-05-10 02:40:40 +00:00
quddusc
498c1b52c9 docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4). 
Change-Id: Ibc5000dfa5509cb1448fa867eb87d4e19c31ff1f
 2014-05-09 19:05:35 -07:00
Robert Ly
37cb8d7530 docs: fix some notification code for wear stacks 
Change-Id: Iea6b444480b161ab08a9ba02dbabb22773862cf0
 2014-05-09 17:01:21 -07:00
Andrew Solovay
9c7fa9c090 am 99aa0c17: am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '99aa0c17d2f033590314272007fee435191ce551':
  doc: Documented how to set notification priority.
 2014-05-09 21:54:52 +00:00
Andrew Solovay
99aa0c17d2 am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '5119f6e6db1cd7254ee71537a56bd133eb7e6a09':
  doc: Documented how to set notification priority.
 2014-05-09 21:15:10 +00:00
Andrew Solovay
5119f6e6db am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '3f22f22aab7d641b9d56e57a2ceec6614e09a5d8':
  doc: Documented how to set notification priority.
 2014-05-09 21:10:28 +00:00
Andrew Solovay
bff632c8ff Merge "doc: Documented how to set notification priority." into klp-docs 2014-05-09 21:01:08 +00:00
Scott Main
03c3b60587 add style to community page to adapt to the new sticky nav styles. 
basically override the new style to use the previous style
because this page does not use sticky nav.

DO NOT SUBMIT UNTIL STICKY NAV CHANGES ARE SUBMITTED.

Change-Id: I3e3e68cf66adc7602a2e8196d4974fd5f0e080b2
 2014-05-09 11:28:16 -07:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:47:58 +00:00
Andrew Solovay
3701cbef0f doc: Documented how to set notification priority. 
This is related to change http://ag/459520, where I added info about appropriate
priority constants for setPriority(int)

Doc is staged to:

http://asolovay.mtv:8998/guide/topics/ui/notifiers/notifications.html#Priority

Bug: 13514649
Change-Id: I792e2f02614c88fbcfe1b0714a9c10da27eb6c37
 2014-05-08 17:58:30 -07:00