91479 Commits

Author SHA1 Message Date
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
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
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
Dirk Dougherty
36b58ea919 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 (Google) Code Review (1) and others
* commit 'd6e176c807d503beb1241ba73355a73ceca47e3e':
  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:21:57 -08:00
Adam Koch
1826e8c36d am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
# Via Adam Koch (1) and Android Git Automerger (1)
* commit '3ef2c0265439af10145be981407d63504e14d9f7':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
2013-02-01 14:21:54 -08:00
Dirk Dougherty
fcd84aa0a8 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 (1) and Dirk Dougherty (1)
* commit 'daf487fe22c0a7fe754390a0bfef5d6b28fdd12b':
  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:21:52 -08:00
Scott Main
e63dfe5a48 docs: fix broken links
Change-Id: I7c63b1a2cfe016744fbef532354821bff024ee17
2013-02-01 14:18:51 -08:00
Dirk Dougherty
e929e66197 Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev 2013-02-01 22:03:41 +00:00
Dirk Dougherty
b4c6c1b218 Doc change: Remove proto scheme from src urls (fix mixed content warning).
Change-Id: I405d0f2e3df5e6e22bf9b09be27f7f7a2d93ba5a
2013-02-01 13:35:42 -08:00
Scott Main
d2242891df am e55d5e86: docs: change "android developer console" to "developer console"
# Via Scott Main
* commit 'e55d5e864b133df8ccf9f92ca4a5d3accb1dab5c':
  docs: change "android developer console" to "developer console"
2013-02-01 13:28:19 -08:00
Scott Main
6c9d637339 am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'f216ded93a783cd4e512f59ba50d04a89d59a267':
  docs: clarify usage for adb am component option
2013-02-01 13:28:15 -08:00
Fabrice Di Meglio
9fd4893c56 am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '7bac3614ff0ee3cef83147cb569c96c00beab919':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
2013-02-01 13:28:12 -08:00
Dirk Dougherty
65fd9811d3 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 Dirk Dougherty (1)
* commit '2aa47b336227a5d2bd1ee91f8fb4bd84be7e97f0':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.
2013-02-01 13:28:08 -08:00
Dirk Dougherty
01084b96a1 am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '3b4b067baec59207640d534be86c7c6c12b06678':
  Doc change: remove duplicate image directory (use /sdk/images instead).
2013-02-01 13:28:05 -08:00
Scott Main
1e7e1104c4 am 4b7161cb: docs: switch devsite doc build to use templates-sdk
# Via Scott Main
* commit '4b7161cbd44f64537d2c661e87868ea2689dd126':
  docs: switch devsite doc build to use templates-sdk
2013-02-01 13:28:01 -08:00
Scott Main
5c37151cb0 am e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
# Via Scott Main
* commit 'e75cd4bfd176fbb1483ec5e17edfbd993adce40f':
  docs: add hdf bool for deviste, used to change aspects of the templates
2013-02-01 13:27:57 -08:00
Scott Main
68d0f32c09 am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '48f9f83ba27bf3a5cac224e30821836b3956c87c':
  docs: update adb tool page with am and pm reference
2013-02-01 13:27:51 -08:00
Dirk Dougherty
f8a9c5090c am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '7b32d32bd38b423dd141e7ead89205b9b7929497':
  Add build rule for ds (devsite) online docs.
2013-02-01 13:27:48 -08:00
Dirk Dougherty
d6e176c807 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 (Google) Code Review (1) and Dirk Dougherty (1)
* commit '2c1669c427826fba48ae7776e34f90cdcc5a3a20':
  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 13:27:35 -08:00
Adam Koch
3ef2c02654 am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
# Via Adam Koch
* commit '376e707f65b3ee6e00953466d6367642d2a02b4b':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
2013-02-01 13:27:26 -08:00
Dirk Dougherty
daf487fe22 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 Dirk Dougherty
* commit 'df9fa4c602e986495fe8795fb800858b48693040':
  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 13:27:19 -08:00
Scott Main
40c7b7a92f docs: delete orphaned images (the obvious ones)
Change-Id: Ib6219e65a05925a13a26c415c69431bc2fbbdc68
2013-02-01 11:57:01 -08:00
Xia Wang
599f9611aa am f3ef10b1: am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and others
* commit 'f3ef10b12b61891962eb6253e95c8c9eec82d383':
  Fix WiFi test:
2013-01-30 18:59:22 -08:00
Xia Wang
f3ef10b12b am 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xia Wang (1)
* commit '2297d1e78cc70d4e19d9e7c66d24fc494455166c':
  Fix WiFi test:
2013-01-30 18:57:50 -08:00
Xia Wang
2297d1e78c Merge "Fix WiFi test:" into jb-mr1.1-dev 2013-01-31 02:54:56 +00:00
Xia Wang
f2991add02 Fix WiFi test:
-- In environment where there are too many APs, sometimes, the AP will not show in the scan list.
    Part of the reason is due to the change that the scanning on each frequency is shortened to save power.
    to avoid that, change the test to connect without scanning.

 -- Increase the timer to wait for WiFi to be connected

Change-Id: If1a72607b3c7ad13dbbf788607665986eaf5b6b3
2013-01-30 18:52:27 -08:00
Scott Main
e55d5e864b docs: change "android developer console" to "developer console"
Change-Id: I7071e97ed22c2971880c0f63cb10f83f887c9935
2013-01-30 15:54:18 -08:00
Scott Main
f216ded93a Merge "docs: clarify usage for adb am component option" into jb-mr1-dev 2013-01-30 23:17:56 +00:00
Scott Main
483d785b42 docs: clarify usage for adb am component option
Change-Id: I0b99dffc0b9d465c3a639bd1f7760561e40e2a5f
2013-01-30 15:16:10 -08:00