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

2294 Commits

Author SHA1 Message Date
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
Scott Main
7471a3b1ea am adcb288e: am b1088bfe: Merge "update common intents guide to add calendar and alarms." into klp-docs 
* commit 'adcb288e3890381c9961ee32a79df8e9d805a6ad':
  update common intents guide to add calendar and alarms.
 2014-04-01 00:12:56 +00: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
ae5d7d5d61 docs: Added new sensor types. Bug: 10674725 
Original SHA-1: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b

Original Conflicts:
	docs/html/guide/topics/sensors/sensors_motion.jd

Change-Id: I8f8632410b2756174ea4dfab8d58486e58cd8db2
 2014-03-24 15:24:43 -07:00
Ricardo Cervera
419b17ec9e am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '1d77a8741c8b08c2b911e714c56521483e23bdac':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:18:29 +00:00
Ricardo Cervera
1d77a8741c am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit '588300cb5211f7217b81683f8a76bdf95c7bfa8d':
  docs: Added new sensor types. Bug: 10674725
 2014-03-21 20:11:48 +00:00
Ricardo Cervera
a7925384c3 docs: Added new sensor types. Bug: 10674725 
Change-Id: Ib378e3a1b3f1812b966c53a0eda6319f1bea464b
 2014-03-21 09:59:22 -07:00
Chris Craik
0b648e6ac3 Update unsupported op tables for API 19, and for extensibility 
Change-Id: I00608d1ddbe919ee49d981809fd086da455d6a0a
 2014-03-19 13:52:23 -07:00
Scott Main
8a1e3ac58c am 6fc25fb7: am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '6fc25fb727e788ea6f33e6cd8a0421750be2ef9a':
  fix typos
 2014-03-12 15:19:14 +00:00
Scott Main
a17a7000f2 am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '2ada4e310d728756fc9bf69086987bfe215dc487':
  fix typos
 2014-03-11 19:18:48 +00:00
Scott Main
2ada4e310d am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-11 17:43:38 +00:00
Scott Main
52d5190052 fix typos 
Change-Id: I28bcbf5ae5fade081d9b71701f5568145d700e9c
 2014-02-26 10:34:54 -08:00
Elliott Hughes
449e46600f am 0047d3e0: am e253b514: am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '0047d3e025b43fd2dc05734f7ea6229291445046':
  Miscellaneous small documentation fixes.
 2014-02-21 17:37:54 +00:00
Elliott Hughes
e253b514f4 am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes." 
* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.
 2014-02-21 17:28:51 +00:00
Elliott Hughes
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
Scott Main
83b6e4b937 am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 21:27:47 +00:00
Scott Main
72eff55b2c am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit 'd43ad2f35abcc647f7985abd09ed9de5899faf18':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:25:57 +00:00
Scott Main
4c68c4ed46 am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '24a8e1d0e9a32c571403bfc730ce18dd138a529c':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 02:20:30 +00:00
Scott Main
8ad4275640 update intent examples for maps 
bug: 12661490
bug: 12957723

Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
 2014-02-19 18:08:33 -08:00
Dirk Dougherty
a97e177857 Merge commit '47d3eaf6' into manualmerge 
Conflicts:
	docs/html/design/patterns/accessibility.jd
	docs/html/design/patterns/actionbar.jd
	docs/html/design/patterns/compatibility.jd
	docs/html/design/patterns/multi-pane-layouts.jd
	docs/html/design/style/iconography.jd

Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
 2014-02-12 19:31:15 -08:00
Joe Fernandez
c462073b24 am 8853b9c4: am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '8853b9c4b478df6ac8286d3dc825aa821f375afa':
  MediaRouter Developer Guide
 2014-02-13 01:11:51 +00:00
Dirk Dougherty
958a7f725d am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:43:56 +00:00
Dirk Dougherty
acec746b89 am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299 am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
  MediaRouter Developer Guide
 2014-02-12 23:33:43 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
 2014-02-12 23:19:10 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00
Ricardo Cervera
0815f499ae am d3417283: am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit 'd34172830cf4ce3524be500d77dc26e80f0f8190':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 23:02:05 +00:00
Joe Fernandez
70a2adc817 MediaRouter Developer Guide 
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html

Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
 2014-02-12 14:12:15 -08:00
Ricardo Cervera
481993e92c am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '3cb62db29583d277ba630ee1644617fff5b615e5':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 22:08:33 +00:00
Ricardo Cervera
640e0c89c3 am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit '36547014a3fa62e966739e12ccd31634b17058e9':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 21:59:39 +00:00
Dirk Dougherty
3155825c25 Doc change: minor edits to support easier extraction of document summaries. 
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
 2014-02-12 13:31:14 -08:00
Ricardo Cervera
670944aa72 Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 2014-02-12 21:05:32 +00:00
Ricardo Cervera
15ab08f94a docs: Added missing elements in uses-feature. Bug: 12913153 
Change-Id: Ib4d5a8bf5b80dcde68ffd031381b0104592b101b
Review: http://quixote.mtv.corp.google.com:8001/guide/topics/manifest/uses-feature-element.html
 2014-02-07 10:48:17 -08:00
Ricardo Cervera
1d2b0c008b am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'adb940131adf137023006fcd86663fd048fa6a54':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:29:59 +00:00
Ricardo Cervera
adb940131a am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8ff1f285c93a1a44a7419ab216bee2f92518387a':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:23:40 +00:00
Ricardo Cervera
b7d456d4a4 am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:17:12 +00:00
Ricardo Cervera
893ee42c72 docs: Updated the retaining an object during conf change. Bug: 10303533 
Replaced use of deprecated methods with retained fragments.

Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
 2014-02-06 10:57:36 -08:00
Stephen Hines
278a561925 am 34b84e69: am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit '34b84e691c4d5bd853bc5b7c7ccb8040590359d6':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:09:21 +00:00
Stephen Hines
34b84e691c am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.
 2014-02-05 02:00:43 +00:00
Stephen Hines
7f75eaa218 Add message to RS docs about application vs. library packaging. 
Change-Id: I49b694629ded066e5ee9c1af29970c59cb637fdd
 2014-01-30 19:43:20 -08:00
Scott Main
22ad5f2139 update common intents guide to add calendar and alarms. 
Change-Id: I515c6c982104f37b04ef0eddfd0ba8a99e619077
 2014-01-17 16:41:16 -08:00