94923 Commits

Author SHA1 Message Date
Kenny Root
133c5f5e91 Merge "AndroidKeyStore: fix tests" 2013-02-04 23:01:01 +00:00
Kenny Root
656f92f2c6 AndroidKeyStore: add key wrapping test
Change-Id: Ib21ab37d22689dd87f014eaa1f7919a575367cdd
2013-02-04 14:53:11 -08:00
Kenny Root
8b58c52bf4 AndroidKeyStore: fix tests
Change-Id: I65fd8ba27af57ea8fd27c8e08c9c1201f32c494d
2013-02-04 14:52:23 -08:00
Scott Main
d799ffc235 docs: update dashboard platform data for feb
Change-Id: Ie248bf69bcdca4434e53ab31a82a55fd9da4825b
2013-02-04 14:02:48 -08:00
Adam Powell
638af2fbb6 am 6a33c403: am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '6a33c4031de8f0b323855c6db8d6ee0c812b0f00':
  Fix regression in expanded action view up
2013-02-04 13:54:56 -08:00
Adam Powell
6a33c4031d am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '569f138ef1a94e6d6cfc0587f06b396a77f00c1c':
  Fix regression in expanded action view up
2013-02-04 13:53:24 -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
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
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
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
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
Kenny Root
ace72f6a37 Merge "Function uri.getAuthority is called twice. Minor doc corrections." 2013-02-04 19:21:26 +00:00
Irfan Sheriff
3274e60a47 am ac20bf1f: am 43a601e7: Merge "Change default intent"
# Via Android Git Automerger (1) and others
* commit 'ac20bf1fcda9210640fd8e4d71b0644a2b012658':
  Change default intent
2013-02-04 10:34:21 -08:00
Irfan Sheriff
ac20bf1fcd am 43a601e7: Merge "Change default intent"
# Via Gerrit Code Review (1) and Irfan Sheriff (1)
* commit '43a601e76966ae1d4af5b1117c10f0479a5f97cd':
  Change default intent
2013-02-04 10:32:11 -08:00
Irfan Sheriff
43a601e769 Merge "Change default intent" 2013-02-04 18:09:27 +00:00
Irfan Sheriff
c4e9e753f4 Change default intent
Older JB releases have a bug handling persistence invocation. One work
around right now is to have the newer release (with persistence)
use  a lower intent value to allow older release to operate in group
owner mode.

Change-Id: I7ffb66081a352929a6f421e5d6141f592be7d472
2013-02-04 09:37:07 -08:00
Dirk Dougherty
ea635a5910 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 (3) and Dirk Dougherty (1)
* commit '6602ade615ce5ad206722b3c3ffac955078a9cc7':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
2013-02-04 09:07:50 -08:00
Scott Main
2502b45f65 am 8f0e965d: am b89123dd: am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '8f0e965de78dbe356fb33ce9eced6ddc3bef5132':
  docs: delete orphaned images (the obvious ones)
2013-02-04 09:07:41 -08:00
Scott Main
7936bee136 am 0031d177: am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links
# Via Android Git Automerger (3) and Scott Main (1)
* commit '0031d177b6137a004930c207f57ac5ac9386c72b':
  docs: fix broken links
2013-02-04 09:07:25 -08:00
Dirk Dougherty
86f962159a 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 (3) and others
* commit '29c40abf9eaa6ed5af6100616cf9cf91a47bc477':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
2013-02-04 09:07:20 -08:00
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