94949 Commits

Author SHA1 Message Date
Scott Main
23becda5d0 am cd655c53: am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'cd655c53cd97b83b1d86f3c5bb38666392feea26':
  docs: change "android developer console" to "developer console"
2013-02-04 09:07:16 -08:00
Scott Main
9186aaaa02 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 (3) and others
* commit '2bbaf754745a6a31fdc8e2ed5eb90d5790f198e9':
  docs: clarify usage for adb am component option
2013-02-04 09:07:13 -08:00
Fabrice Di Meglio
48b4c17ce1 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 (3) and others
* commit '4dcdfb89015942f57b98861a7fbcef948364b992':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
2013-02-04 09:07:09 -08:00
Dirk Dougherty
25f9743530 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 (3) and others
* commit '5fca0efa17c85945fc42cb1a890889f3fab8ec00':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
2013-02-04 09:07:05 -08:00
Dirk Dougherty
6a4c6f43ea 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 (3) and others
* commit 'd1e1e5353acfd229190faaf8c7a905c4b23efde1':
  Doc change: remove duplicate image directory (use /sdk/images instead).
2013-02-04 09:07:01 -08:00
Scott Main
9dbf24797b am 960deffd: am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (3) and Scott Main (1)
* commit '960deffd7818df6276901cc2ed4bf7241fcd6002':
  docs: switch devsite doc build to use templates-sdk
2013-02-04 09:06:58 -08:00
Scott Main
0dd7503490 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 (3) and Scott Main (1)
* commit 'd4f5ce03a85274026e7ec86f33e515f77e36a8f9':
  docs: add hdf bool for deviste, used to change aspects of the templates
2013-02-04 09:06:55 -08:00
Scott Main
91f9429433 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 (3) and others
* commit '2357d9796a5dbbbe95c2b27eacf11f0b19d5d9c7':
  docs: update adb tool page with am and pm reference
2013-02-04 09:06:51 -08:00
Dirk Dougherty
61101eee36 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 (3) and others
* commit 'e27f64b0092f8ce8d9578f7f6e4929fa4eac5782':
  Add build rule for ds (devsite) online docs.
2013-02-04 09:06:48 -08:00
Dirk Dougherty
23aa4774b7 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 (3) and others
* commit '904ffedb7e904246aadcc5519da2adbf112a0430':
  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 09:06:45 -08:00
Adam Koch
7ffbbc276c 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 (3) and Adam Koch (1)
* commit '01e894340f262239254a633817d169fd54ba2268':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
2013-02-04 09:06:41 -08:00
Dirk Dougherty
9ab0f98920 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 (3) and Dirk Dougherty (1)
* commit '693d0b00006cea2645d6487418e009ec3f328402':
  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 09:06:38 -08:00
Yury Zhauniarovich
f9c5176a51 Function uri.getAuthority is called twice. Minor doc corrections.
Function uri.getAuthority was called twice in methods acquireProvider
and acquireExistingProvider was called twice although a parameter
representing the value had existed. The second call to the function is
changed to the parameter. The parameter's modifier changed to final.
Minor corrections in function descriptions in the file.

Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
Change-Id: Id003aa38c17d644357873c41a8f5ec455e46a4b7
2013-02-03 16:14:11 +00:00
The Android Automerger
2a8b9262fc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-01 18:25:20 -08:00
Dake Gu
9f811fd447 SimulatdDpad: fix NPE for event without device
Fix a rare case that We lost device(due to network issue)
and SimulatedDpad received the MotionEvent without device.

b/8121964

Change-Id: Ie2948e6ff14a84422b05dda8ea87a3571f26f252
2013-02-01 16:31:42 -08:00
Dirk Dougherty
6602ade615 am ed1c148d: am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'ed1c148dc3358f396e437e8bda17459a0125c53b':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
2013-02-01 15:56:57 -08:00
Dirk Dougherty
ed1c148dc3 am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '3d57823a2e813ef9d535aab6c40ecbc509f5ab71':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
2013-02-01 15:54:54 -08:00
Dirk Dougherty
3d57823a2e am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
# Via Dirk Dougherty
* commit '8a72b6e0db11dec73253b938defc2847a8c8234d':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
2013-02-01 15:52:33 -08:00
Dirk Dougherty
8a72b6e0db Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
Change-Id: I1c2276f5fb057a0ca20c0d1feef2bce0ab7ffab8
2013-02-01 15:00:09 -08:00
Scott Main
8f0e965de7 am b89123dd: am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit 'b89123ddd492b1e4f75bcc619245345b2f19d570':
  docs: delete orphaned images (the obvious ones)
2013-02-01 14:33:17 -08:00
Scott Main
b89123ddd4 am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '8b62c402cdb50b8b1b1ff5d1f17021f89866b4c6':
  docs: delete orphaned images (the obvious ones)
2013-02-01 14:29:47 -08:00
Scott Main
0031d177b6 am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links
# Via Android Git Automerger (2) and Scott Main (1)
* commit 'e63e6d0711db6ce5c62d3a8a3eadfc580670c3dc':
  docs: fix broken links
2013-02-01 14:29:39 -08:00
Dirk Dougherty
29c40abf9e 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 (2) and others
* commit '18e9a79f2a6f1f2e85499f6713f63b091197130b':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
2013-02-01 14:29:35 -08:00
Scott Main
8b62c402cd am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'bf1d230b05becec58992fb10967b9b6dba67b967':
  docs: delete orphaned images (the obvious ones)
2013-02-01 14:27:13 -08:00
Scott Main
cd655c53cd am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (2) and Scott Main (1)
* commit '7d47fbf346a31c07a403bf6898220e7e4045ed34':
  docs: change "android developer console" to "developer console"
2013-02-01 14:26:11 -08:00
Scott Main
2bbaf75474 am 80235ca7: am 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '80235ca788537c9acd133f40066c3c75f3585a2e':
  docs: clarify usage for adb am component option
2013-02-01 14:26:09 -08:00
Fabrice Di Meglio
4dcdfb8901 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 (2) and others
* commit 'f5951baf7dcc426485badf19985148b6a2fcf82e':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
2013-02-01 14:26:05 -08:00
Scott Main
e63e6d0711 am 3424794d: am e63dfe5a: docs: fix broken links
# Via Android Git Automerger (1) and Scott Main (1)
* commit '3424794d55ff5c97c89d930d9ad2a577cb2b2f52':
  docs: fix broken links
2013-02-01 14:26:05 -08:00
Dirk Dougherty
5fca0efa17 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 (2) and others
* commit '6cb87b088381f4c0cba334a1285d8d170458b793':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
2013-02-01 14:26:03 -08:00
Dirk Dougherty
18e9a79f2a am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '120f7eb5e25ce884c30454ae9ad56b1e2c3de101':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
2013-02-01 14:26:01 -08:00
Dirk Dougherty
d1e1e5353a 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 (2) and others
* commit 'a929ea12d8291dee5804b3a9a1e5a54719224d41':
  Doc change: remove duplicate image directory (use /sdk/images instead).
2013-02-01 14:25:58 -08:00
Scott Main
960deffd78 am 78bf7c9c: am 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (2) and Scott Main (1)
* commit '78bf7c9c0c4ded4efe8a2bd7255ee1a1b0ec513e':
  docs: switch devsite doc build to use templates-sdk
2013-02-01 14:25:52 -08:00
Scott Main
d4f5ce03a8 am 6dfb4d0a: am 5c37151c: am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (2) and Scott Main (1)
* commit '6dfb4d0a4ed8877c89f4dcfd76918af9da59dba5':
  docs: add hdf bool for deviste, used to change aspects of the templates
2013-02-01 14:25:45 -08:00
Scott Main
2357d9796a 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 (2) and others
* commit '2e5b230639fc4946de962c3e53ed26685b8b54b8':
  docs: update adb tool page with am and pm reference
2013-02-01 14:25:42 -08:00
Dirk Dougherty
e27f64b009 am 1417357e: am f8a9c509: am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '1417357e005c7d751ecf95a7100bbc5ce3dbe669':
  Add build rule for ds (devsite) online docs.
2013-02-01 14:25:39 -08:00
Dirk Dougherty
904ffedb7e 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 (2) and others
* commit '36b58ea919140a20c7bc4315becad5d6737d1a94':
  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-01 14:25:34 -08:00
Adam Koch
01e894340f 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 (2) and Adam Koch (1)
* commit '1826e8c36de8937652416c7702addc6fc7efc489':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
2013-02-01 14:25:29 -08:00
Dirk Dougherty
693d0b0000 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 (2) and Dirk Dougherty (1)
* commit 'fcd84aa0a8d83490c2b6c14ed08b63297ca99a1b':
  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-01 14:25:25 -08:00
Scott Main
bf1d230b05 Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 2013-02-01 22:23:01 +00:00
Scott Main
3424794d55 am e63dfe5a: docs: fix broken links
# Via Scott Main
* commit 'e63dfe5a4804b24e3acb537763d821036b5bb87f':
  docs: fix broken links
2013-02-01 14:22:40 -08:00
Dirk Dougherty
120f7eb5e2 am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit 'e929e66197bf1421c3afbada964b1a33816ccaa8':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
2013-02-01 14:22:35 -08:00
Scott Main
7d47fbf346 am d2242891: am e55d5e86: docs: change "android developer console" to "developer console"
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'd2242891dfe37838e47b24c161108365a368aa86':
  docs: change "android developer console" to "developer console"
2013-02-01 14:22:31 -08:00
Scott Main
80235ca788 am 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '6c9d637339c87a9c0938528d862f1fa0723b7e8e':
  docs: clarify usage for adb am component option
2013-02-01 14:22:29 -08:00
Fabrice Di Meglio
f5951baf7d am 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '9fd4893c56747a154094ecf1a1733a5faf7f8976':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
2013-02-01 14:22:24 -08:00
Dirk Dougherty
6cb87b0883 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 (Google) Code Review (1) and others
* commit '65fd9811d3b00698ab25233543c2e49ef22c634b':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
2013-02-01 14:22:20 -08:00
Dirk Dougherty
a929ea12d8 am 01084b96: am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '01084b96a15885698d602ee563dc8e18bf52acfa':
  Doc change: remove duplicate image directory (use /sdk/images instead).
2013-02-01 14:22:16 -08:00
Scott Main
78bf7c9c0c am 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Android Git Automerger (1) and Scott Main (1)
* commit '1e7e1104c422d89393565bba591479c1ccbae06d':
  docs: switch devsite doc build to use templates-sdk
2013-02-01 14:22:13 -08:00
Scott Main
6dfb4d0a4e am 5c37151c: am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Android Git Automerger (1) and Scott Main (1)
* commit '5c37151cb07519affba8e20018e0f0069d426527':
  docs: add hdf bool for deviste, used to change aspects of the templates
2013-02-01 14:22:10 -08:00
Scott Main
2e5b230639 am 68d0f32c: am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '68d0f32c09063e4ede569e84f8726dc1e96ab044':
  docs: update adb tool page with am and pm reference
2013-02-01 14:22:07 -08:00
Dirk Dougherty
1417357e00 am f8a9c509: am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit 'f8a9c5090c7b9e4cfd27bf65093939381746e638':
  Add build rule for ds (devsite) online docs.
2013-02-01 14:22:03 -08:00