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

2336 Commits

Author SHA1 Message Date
Dirk Dougherty
9a6672beb1 resolved conflices for merge of 93ccd1a2 to master 
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
 2014-05-14 14:50:13 -07: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
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
3506ac87c0 Doc change: Updated content for distribute. 
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
 2014-05-14 14:10:51 -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
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
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
Eino-Ville Talvala
1caeb10a7a DO NOT MERGE: Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 21:47:36 +00:00
Eino-Ville Talvala
9131da28e1 Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 11:53:01 -07:00
Scott Main
3b23c019cf am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'b5342f965b19a053b093f554930893b91c2e763e':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-07 00:00:20 +00:00
Scott Main
b5342f965b am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit 'fe99729539c8e51ce13c88dd9c999a458032356a':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:57:08 +00:00
Scott Main
fe99729539 am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed. 
* commit '01dc133b35021878b9c7c45d862cacb2b7645a4d':
  fix code error. The data type was wrong, but it's actually not needed.
 2014-05-06 23:53:22 +00:00
Scott Main
f1bc39b8ae fix code error. 
The data type was wrong, but it's actually not needed.

Change-Id: I50275fd16c72de42b75f24be6192ca974bd67488
 2014-05-06 16:34:30 -07:00
David Friedman
23962cb7db am 86318b7d: am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '86318b7daae6a741cf18c8a37297f978d5e5e42a':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:11:36 +00:00
David Friedman
86318b7daa am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '0c18705bf10e1e04fbb2b2afaf5f9537764148a5':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:07:40 +00:00
David Friedman
0c18705bf1 am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '3fef8e60668bb955763367ac17c1195e46b3078c':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:03:25 +00:00
David Friedman
5fb79db94e Fixed missing line break, broken link. 
Bug: 13975265
Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html

Change-Id: I69f7e56f9b261c776672161cfb1649c4cd72c96e
 2014-04-25 14:02:16 -07:00
Andrew Solovay
23af77a3cd am 9a4db311: am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '9a4db3114b1f3c5c682ee4c9c6f78651c5fc38b8':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:48:57 +00:00
Andrew Solovay
9a4db3114b am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '3cb4430b071e9e978853f73c0cccd15dc2f37a49':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:45:09 +00:00
Andrew Solovay
3cb4430b07 am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '27547e6d3a22fb9615594769e460c6a86f2dd44b':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:41:26 +00:00
Andrew Solovay
fdc9e56ff8 Correcting name of 'Backup & reset' menu. 
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing

Bug: 14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
 2014-04-24 15:59:45 -07:00
Andrew Solovay
fb5d9f3381 am e4593554: am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit 'e4593554ddcdaeb93a6d624fbd6641c4624de536':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:55:21 +00:00
Andrew Solovay
e4593554dd am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '32117212fc48872b557044ff25ba6b8d9ace5738':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:51:48 +00:00
Andrew Solovay
32117212fc am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:47:50 +00:00
Andrew Solovay
026c82b191 Doc: Fixed a code sample to use standard methods. Also some formatting 
tweaks.

Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.

(Update: Fixed indentation that I broke on a code sample.)

Bug: 14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1
 2014-04-22 19:29:07 -07:00
Andrew Solovay
cd8f0c58bb am 97b7208f: am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample. 
* commit '97b7208fa436d279b5a7cc4fc582e7ba89181a84':
  Fixed a typo in a code sample.
 2014-04-22 13:41:50 +00:00
Andrew Solovay
97b7208fa4 am da1a10f7: am c68e2089: am 3555e4ae: Fixed a typo in a code sample. 
* commit 'da1a10f727746f9f85c576adb2c4c91c552255f3':
  Fixed a typo in a code sample.
 2014-04-22 13:36:44 +00:00
Andrew Solovay
da1a10f727 am c68e2089: am 3555e4ae: Fixed a typo in a code sample. 
* commit 'c68e2089755dc35b34d620944bcceb63e1283015':
  Fixed a typo in a code sample.
 2014-04-22 13:27:09 +00:00
Andrew Solovay
3555e4aef0 Fixed a typo in a code sample. 
Fix is staged to: http://asolovay.mtv.corp.google.com:9000/guide/topics/ui/actionbar.html#Dropdown

Bug: 14043905

Change-Id: I8b71d55d51bf88ab9790309e6e63e755d03b2c85
 2014-04-22 00:04:39 +00:00
Ricardo Cervera
92f4a3465e am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'fa711a33be265d1fcd08efd850085615ec66dd89':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:03:14 +00:00
Ricardo Cervera
fa711a33be am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'd09e1bffe412ace61a411873cc8d0a3759540e46':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:59:03 +00:00
Ricardo Cervera
d09e1bffe4 am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:54:31 +00:00
Ricardo Cervera
6aeea45497 Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 2014-04-18 01:46:25 +00:00
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141. 
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
 2014-04-17 12:31:18 -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
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
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
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
Joe Fernandez
55b38fadd0 docs: MediaRouteProvider Developer Guide 
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
 2014-04-02 15:35:15 -07:00
Scott Main
0ba2de8530 am 7471a3b1: am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit '7471a3b1ea3b722168ed3e932d4015750c913c0b':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:24:53 +00:00