99795 Commits

Author SHA1 Message Date
Alon Albert
971c28b831 Add EVENT_COLOR's to Event Entity Iterator
Bug: 8132457
Change-Id: Id6ace96532aa745c1b36290b525dfdf154fe2134
2013-02-04 13:49:50 -08:00
Dirk Dougherty
05cc5c65ab am 59abf4ae: am db3ace21: am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '59abf4ae5772349c306ae38792ef651ea845c9c7':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
2013-02-04 13:49:14 -08:00
Adam Powell
569f138ef1 am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '67389e0acec6877528c4cdaed99bf0a295bf74b9':
  Fix regression in expanded action view up
2013-02-04 13:48:49 -08:00
Chris Craik
d4cf7df151 am e51ccb15: Merge "Simplify display list logging, removing pointers"
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit 'e51ccb1543ef5b6427e5f270ae38be75e18daccd':
  Simplify display list logging, removing pointers
2013-02-04 13:48:48 -08:00
Dirk Dougherty
59abf4ae57 am db3ace21: am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'db3ace21268ff06b4ebc8733cc8ed3ae9e3091ec':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
2013-02-04 13:47:16 -08:00
Dirk Dougherty
db3ace2126 am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '98ffd11c25cb620872a0dd4421332c41309ac475':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
2013-02-04 13:45:05 -08:00
Chris Craik
e51ccb1543 Merge "Simplify display list logging, removing pointers" 2013-02-04 21:44:48 +00:00
Adam Powell
67389e0ace Merge "Fix regression in expanded action view up" into jb-mr1.1-dev 2013-02-04 21:43:18 +00:00
Dirk Dougherty
98ffd11c25 am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds.
# Via Dirk Dougherty
* commit '2623157244ae397fcaeecc46fab83a307b49b48f':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
2013-02-04 13:42:42 -08:00
Dirk Dougherty
2623157244 Doc change: add redirects file (yaml) for use in devsite docs builds.
Change-Id: I87d922bd4959c093544caf2addcb322ca7208fe8
2013-02-04 13:39:38 -08:00
Dirk Dougherty
6325fdf849 am 71e404d2: am ea635a59: am 6602ade6: am ed1c148d: am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Android Git Automerger (5) and Dirk Dougherty (1)
* commit '71e404d2042238ad589fbf82a100145fc0da653c':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
2013-02-04 13:20:47 -08:00
Scott Main
b42dcff6dc am 0edabe4f: am 2502b45f: am 8f0e965d: am b89123dd: am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '0edabe4fd9766fac2ef58d5f0295c4f81c44d86b':
  docs: delete orphaned images (the obvious ones)
2013-02-04 13:20:44 -08:00
Scott Main
16f50d033e am e1cc84a2: am 7936bee1: am 0031d177: am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links
# Via Android Git Automerger (5) and Scott Main (1)
* commit 'e1cc84a28d7f34ed887627514cb0f570255ee3f2':
  docs: fix broken links
2013-02-04 13:20:40 -08:00
Dirk Dougherty
55a7a85f21 am 6526382f: am 86f96215: am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '6526382f568214e1a5f2245f3627feb714b94797':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
2013-02-04 13:20:36 -08:00
Scott Main
367a8c59e5 am ec9d2596: am 23becda5: am cd655c53: am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (5) and Scott Main (1)
* commit 'ec9d2596194868e9eefcfc33a22a7e0fdedf2299':
  docs: change "android developer console" to "developer console"
2013-02-04 13:20:33 -08:00
Scott Main
b38666cc80 am afd3d19b: am 9186aaaa: am 2bbaf754: am 80235ca7: am 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit 'afd3d19bc4d78e1c4940fab790dc46f1715024b9':
  docs: clarify usage for adb am component option
2013-02-04 13:20:29 -08:00
Fabrice Di Meglio
a944deef36 am e44e4eae: (-s ours) am 48b4c17c: (-s ours) am 4dcdfb89: am f5951baf: (-s ours) am 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit 'e44e4eae0857f6c02b76e15bce37f2374d14d58f':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
2013-02-04 13:20:27 -08:00
Dirk Dougherty
2da17bbf31 am feda56f2: am 25f97435: am 5fca0efa: am 6cb87b08: am 65fd9811: am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit 'feda56f2fbbb980f074bce4444578238544aefe1':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
2013-02-04 13:20:23 -08:00
Dirk Dougherty
4c06ce7671 am 1ea5c760: am 6a4c6f43: am d1e1e535: am a929ea12: am 01084b96: am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '1ea5c76050e2c3667cfb93863e3a493d681e7014':
  Doc change: remove duplicate image directory (use /sdk/images instead).
2013-02-04 13:20:19 -08:00
Scott Main
0c5719b251 am d8a61002: am 9dbf2479: am 960deffd: am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (5) and Scott Main (1)
* commit 'd8a6100208c277e131e94df314b84e41b067ad7a':
  docs: switch devsite doc build to use templates-sdk
2013-02-04 13:20:15 -08:00
Scott Main
b3d9ff9f11 am 4dfff520: am 0dd75034: am d4f5ce03: am 6dfb4d0a: am 5c37151c: am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (5) and Scott Main (1)
* commit '4dfff520362bdd6b3f661e3aa371b2efa527fc64':
  docs: add hdf bool for deviste, used to change aspects of the templates
2013-02-04 13:20:12 -08:00
Scott Main
4c20864e2f am a6d9990f: am 91f94294: am 2357d979: am 2e5b2306: am 68d0f32c: am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit 'a6d9990fba38022073b0f1c1b156f16a4fe2dffd':
  docs: update adb tool page with am and pm reference
2013-02-04 13:20:07 -08:00
Dirk Dougherty
1d426ef63a am 3256aeed: am 61101eee: am e27f64b0: am 1417357e: am f8a9c509: am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit '3256aeed5fc85a1bfcaf5c9a6236519b96e908af':
  Add build rule for ds (devsite) online docs.
2013-02-04 13:20:04 -08:00
Dirk Dougherty
e16e80a48c am db911cf4: am 23aa4774: am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr
# Via Android Git Automerger (5) and others
* commit 'db911cf4098213777e738b05995f26833a9f493c':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
2013-02-04 13:20:00 -08:00
Adam Koch
66129e6af7 am c013451d: am 7ffbbc27: am 01e89434: am 1826e8c3: am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
# Via Android Git Automerger (5) and Adam Koch (1)
* commit 'c013451d63dcd0c331ec58abc8b1f030556e22bb':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
2013-02-04 13:19:57 -08:00
Dirk Dougherty
33cab55470 am 5c828c74: am 9ab0f989: am 693d0b00: am fcd84aa0: am daf487fe: am df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (5) and Dirk Dougherty (1)
* commit '5c828c748de090be12ff74ecf4741d8cecf13d31':
  Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
2013-02-04 13:19:54 -08:00
Dirk Dougherty
71e404d204 am ea635a59: am 6602ade6: am ed1c148d: am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'ea635a59100e02e298f80fa66e9d8570c78e4175':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
2013-02-04 13:18:04 -08:00
Scott Main
0edabe4fd9 am 2502b45f: am 8f0e965d: am b89123dd: am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '2502b45f652eb8a56b88d6618636903175d5b848':
  docs: delete orphaned images (the obvious ones)
2013-02-04 13:17:58 -08:00
Scott Main
e1cc84a28d am 7936bee1: am 0031d177: am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links
# Via Android Git Automerger (4) and Scott Main (1)
* commit '7936bee1364ed96a1e96f4fa8af07f1ab26b6791':
  docs: fix broken links
2013-02-04 13:17:54 -08:00
Dirk Dougherty
6526382f56 am 86f96215: am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '86f962159a0cc3c5b56d7fcf8d4187eefd5f4442':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
2013-02-04 13:17:49 -08:00
Scott Main
ec9d259619 am 23becda5: am cd655c53: am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (4) and Scott Main (1)
* commit '23becda5d008bfe64a9b101e6967d96d4ece8d0e':
  docs: change "android developer console" to "developer console"
2013-02-04 13:17:45 -08:00
Scott Main
afd3d19bc4 am 9186aaaa: am 2bbaf754: am 80235ca7: am 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '9186aaaa0283cf6a26f3b2bcf8e7d35087b4e71e':
  docs: clarify usage for adb am component option
2013-02-04 13:17:41 -08:00
Fabrice Di Meglio
e44e4eae08 am 48b4c17c: (-s ours) am 4dcdfb89: am f5951baf: (-s ours) am 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '48b4c17ce1537234a2a6a39c9c00d3663b2a7274':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
2013-02-04 13:17:37 -08:00
Dirk Dougherty
feda56f2fb am 25f97435: am 5fca0efa: am 6cb87b08: am 65fd9811: am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '25f97435302d8468afeb4ade9f00d5243b393082':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
2013-02-04 13:17:32 -08:00
Dirk Dougherty
1ea5c76050 am 6a4c6f43: am d1e1e535: am a929ea12: am 01084b96: am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '6a4c6f43ea936c487a7b2c8797d93daedf1532e6':
  Doc change: remove duplicate image directory (use /sdk/images instead).
2013-02-04 13:17:26 -08:00
Scott Main
d8a6100208 am 9dbf2479: am 960deffd: am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (4) and Scott Main (1)
* commit '9dbf24797b82f4c70a75051050f32e53d1c35fe6':
  docs: switch devsite doc build to use templates-sdk
2013-02-04 13:17:21 -08:00
Scott Main
4dfff52036 am 0dd75034: am d4f5ce03: am 6dfb4d0a: am 5c37151c: am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (4) and Scott Main (1)
* commit '0dd750349004579ca3356a155eb8a86994a45df2':
  docs: add hdf bool for deviste, used to change aspects of the templates
2013-02-04 13:17:16 -08:00
Scott Main
a6d9990fba am 91f94294: am 2357d979: am 2e5b2306: am 68d0f32c: am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '91f942943365f74a10731503bf40a89bbb090956':
  docs: update adb tool page with am and pm reference
2013-02-04 13:17:12 -08:00
Dirk Dougherty
3256aeed5f am 61101eee: am e27f64b0: am 1417357e: am f8a9c509: am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '61101eee367be6f3bae5974b05c4c3ae912bddaa':
  Add build rule for ds (devsite) online docs.
2013-02-04 13:17:08 -08:00
Dirk Dougherty
db911cf409 am 23aa4774: am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '23aa4774b74bdd7b59a36fdf37333d33e03d7a1f':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
2013-02-04 13:17:03 -08:00
Adam Koch
c013451d63 am 7ffbbc27: am 01e89434: am 1826e8c3: am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
# Via Android Git Automerger (4) and Adam Koch (1)
* commit '7ffbbc276cfc9748a116dca3e8dac99c6b4490b4':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
2013-02-04 13:16:58 -08:00
Dirk Dougherty
5c828c748d am 9ab0f989: am 693d0b00: am fcd84aa0: am daf487fe: am df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava.
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '9ab0f98920596aeb5554ccd591322ec2d1f12484':
  Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
2013-02-04 13:16:52 -08:00
Adam Powell
62f33030b9 Fix regression in expanded action view up
A bug was introduced when these views were restructured. Make sure that the
Up button for expanded action views functions/focuses correctly.

Bug 8124825

Change-Id: I0a886e62fca21dbb9a173db87642bb79ce9245e7
2013-02-04 12:47:34 -08:00
Chris Craik
3dc553babe Simplify display list logging, removing pointers
Also fix save indents

Change-Id: Ia1add83422fbc200b85fd6688f5be60292b0f178
2013-02-04 12:45:13 -08:00
Derek Sollenberger
d81ec456bb Changes needed to roll Skia to r7527.
Change-Id: I84aef3f8a733c869fade06021816646001532758
2013-02-04 15:42:26 -05:00
Daniel Sandler
40e4cadf2f am cd80392f: Merge "Capture semantic Notification.Builder data in extras."
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit 'cd80392fe706e0b419a3e655702006a25d397243':
  Capture semantic Notification.Builder data in extras.
2013-02-04 12:35:09 -08:00
Daniel Sandler
cd80392fe7 Merge "Capture semantic Notification.Builder data in extras." 2013-02-04 20:31:31 +00:00
Kenny Root
3789b2fb82 am ace72f6a: Merge "Function uri.getAuthority is called twice. Minor doc corrections."
# By Yury Zhauniarovich
# Via Gerrit Code Review
* commit 'ace72f6a37ffc232172346b3385494ef10195583':
  Function uri.getAuthority is called twice. Minor doc corrections.
2013-02-04 11:44:53 -08:00
Santos Cordon
0dc2c167f0 am 8a747410: Fixing up doc links.
# Via Santos Cordon
* commit '8a747410e19f1bfd0cbae7415f2aabe35481b22f':
  Fixing up doc links.
2013-02-04 11:26:47 -08:00
Kenny Root
ace72f6a37 Merge "Function uri.getAuthority is called twice. Minor doc corrections." 2013-02-04 19:21:26 +00:00