OSDN Git Service

android-x86/frameworks-base.git
11 years agoam 3424794d: am e63dfe5a: docs: fix broken links
Scott Main [Fri, 1 Feb 2013 22:26:05 +0000 (14:26 -0800)]
am 3424794d: am e63dfe5a: docs: fix broken links

# Via Android Git Automerger (1) and Scott Main (1)
* commit '3424794d55ff5c97c89d930d9ad2a577cb2b2f52':
  docs: fix broken links

11 years agoam 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix...
Dirk Dougherty [Fri, 1 Feb 2013 22:26:01 +0000 (14:26 -0800)]
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).

11 years agoam e63dfe5a: docs: fix broken links
Scott Main [Fri, 1 Feb 2013 22:22:40 +0000 (14:22 -0800)]
am e63dfe5a: docs: fix broken links

# Via Scott Main
* commit 'e63dfe5a4804b24e3acb537763d821036b5bb87f':
  docs: fix broken links

11 years agoam e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content...
Dirk Dougherty [Fri, 1 Feb 2013 22:22:35 +0000 (14:22 -0800)]
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).

11 years agoam d2242891: am e55d5e86: docs: change "android developer console" to "developer...
Scott Main [Fri, 1 Feb 2013 22:22:31 +0000 (14:22 -0800)]
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"

11 years agoam 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option...
Scott Main [Fri, 1 Feb 2013 22:22:29 +0000 (14:22 -0800)]
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

11 years agoam 9fd4893c: (-s ours) am 7bac3614: Merge "Fix Javadoc for View layoutDirection ...
Fabrice Di Meglio [Fri, 1 Feb 2013 22:22:24 +0000 (14:22 -0800)]
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

11 years agoam 65fd9811: am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build...
Dirk Dougherty [Fri, 1 Feb 2013 22:22:20 +0000 (14:22 -0800)]
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.

11 years agoam 01084b96: am 3b4b067b: Merge "Doc change: remove duplicate image directory (use...
Dirk Dougherty [Fri, 1 Feb 2013 22:22:16 +0000 (14:22 -0800)]
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).

11 years agoam 1e7e1104: am 4b7161cb: docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 22:22:13 +0000 (14:22 -0800)]
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

11 years agoam 5c37151c: am e75cd4bf: docs: add hdf bool for deviste, used to change aspects...
Scott Main [Fri, 1 Feb 2013 22:22:10 +0000 (14:22 -0800)]
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

11 years agoam 68d0f32c: am 48f9f83b: Merge "docs: update adb tool page with am and pm reference...
Scott Main [Fri, 1 Feb 2013 22:22:07 +0000 (14:22 -0800)]
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

11 years agoam f8a9c509: am 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into...
Dirk Dougherty [Fri, 1 Feb 2013 22:22:03 +0000 (14:22 -0800)]
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.

11 years agoam d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized...
Dirk Dougherty [Fri, 1 Feb 2013 22:21:57 +0000 (14:21 -0800)]
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.

11 years agoam 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample...
Adam Koch [Fri, 1 Feb 2013 22:21:54 +0000 (14:21 -0800)]
am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see 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)

11 years agoam daf487fe: am df9fa4c6: Doc change: Explicitly declare pages that should use the...
Dirk Dougherty [Fri, 1 Feb 2013 22:21:52 +0000 (14:21 -0800)]
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.

11 years agodocs: fix broken links
Scott Main [Fri, 1 Feb 2013 22:18:51 +0000 (14:18 -0800)]
docs: fix broken links

Change-Id: I7c63b1a2cfe016744fbef532354821bff024ee17

11 years agoMerge "Doc change: Remove proto scheme from src urls (fix mixed content warning)...
Dirk Dougherty [Fri, 1 Feb 2013 22:03:41 +0000 (22:03 +0000)]
Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev

11 years agoDoc change: Remove proto scheme from src urls (fix mixed content warning).
Dirk Dougherty [Fri, 1 Feb 2013 21:35:42 +0000 (13:35 -0800)]
Doc change: Remove proto scheme from src urls (fix mixed content warning).

Change-Id: I405d0f2e3df5e6e22bf9b09be27f7f7a2d93ba5a

11 years agoam e55d5e86: docs: change "android developer console" to "developer console"
Scott Main [Fri, 1 Feb 2013 21:28:19 +0000 (13:28 -0800)]
am e55d5e86: docs: change "android developer console" to "developer console"

# Via Scott Main
* commit 'e55d5e864b133df8ccf9f92ca4a5d3accb1dab5c':
  docs: change "android developer console" to "developer console"

11 years agoam f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev
Scott Main [Fri, 1 Feb 2013 21:28:15 +0000 (13:28 -0800)]
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

11 years agoam 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignm...
Fabrice Di Meglio [Fri, 1 Feb 2013 21:28:12 +0000 (13:28 -0800)]
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

11 years agoam 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now...
Dirk Dougherty [Fri, 1 Feb 2013 21:28:08 +0000 (13:28 -0800)]
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.

11 years agoam 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images...
Dirk Dougherty [Fri, 1 Feb 2013 21:28:05 +0000 (13:28 -0800)]
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).

11 years agoam 4b7161cb: docs: switch devsite doc build to use templates-sdk
Scott Main [Fri, 1 Feb 2013 21:28:01 +0000 (13:28 -0800)]
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

11 years agoam e75cd4bf: docs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Fri, 1 Feb 2013 21:27:57 +0000 (13:27 -0800)]
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

11 years agoam 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb...
Scott Main [Fri, 1 Feb 2013 21:27:51 +0000 (13:27 -0800)]
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

11 years agoam 7b32d32b: Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
Dirk Dougherty [Fri, 1 Feb 2013 21:27:48 +0000 (13:27 -0800)]
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.

11 years agoam 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in...
Dirk Dougherty [Fri, 1 Feb 2013 21:27:35 +0000 (13:27 -0800)]
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.

11 years agoam 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sampl...
Adam Koch [Fri, 1 Feb 2013 21:27:26 +0000 (13:27 -0800)]
am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see ag/268000)

# Via Adam Koch
* commit '376e707f65b3ee6e00953466d6367642d2a02b4b':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)

11 years agoam df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page...
Dirk Dougherty [Fri, 1 Feb 2013 21:27:19 +0000 (13:27 -0800)]
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.

11 years agoam 2297d1e7: Merge "Fix WiFi test:" into jb-mr1.1-dev
Xia Wang [Thu, 31 Jan 2013 02:57:50 +0000 (18:57 -0800)]
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:

11 years agoMerge "Fix WiFi test:" into jb-mr1.1-dev
Xia Wang [Thu, 31 Jan 2013 02:54:55 +0000 (02:54 +0000)]
Merge "Fix WiFi test:" into jb-mr1.1-dev

11 years agoFix WiFi test:
Xia Wang [Wed, 30 Jan 2013 23:02:21 +0000 (15:02 -0800)]
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

11 years agodocs: change "android developer console" to "developer console"
Scott Main [Wed, 30 Jan 2013 23:54:18 +0000 (15:54 -0800)]
docs: change "android developer console" to "developer console"

Change-Id: I7071e97ed22c2971880c0f63cb10f83f887c9935

11 years agoMerge "docs: clarify usage for adb am component option" into jb-mr1-dev
Scott Main [Wed, 30 Jan 2013 23:17:33 +0000 (23:17 +0000)]
Merge "docs: clarify usage for adb am component option" into jb-mr1-dev

11 years agodocs: clarify usage for adb am component option
Scott Main [Wed, 30 Jan 2013 23:16:10 +0000 (15:16 -0800)]
docs: clarify usage for adb am component option

Change-Id: I0b99dffc0b9d465c3a639bd1f7760561e40e2a5f

11 years agoMerge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO...
Fabrice Di Meglio [Wed, 30 Jan 2013 23:04:24 +0000 (23:04 +0000)]
Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev

11 years agoFix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Fabrice Di Meglio [Thu, 15 Nov 2012 01:59:06 +0000 (17:59 -0800)]
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE

Change-Id: I19b7a53c1c7d805fb9b1611e8944db27c82fc986

11 years agoMerge "Doc change: remove htmlified samples from docs build for now. Samples are...
Dirk Dougherty [Tue, 29 Jan 2013 23:40:00 +0000 (23:40 +0000)]
Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev

11 years agoDoc change: remove htmlified samples from docs build for now. Samples are still downl...
Dirk Dougherty [Tue, 29 Jan 2013 23:00:04 +0000 (15:00 -0800)]
Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.

Change-Id: I9cfa53e605f476daf6cf914f256df600e1d77f89

11 years agoMerge "Doc change: remove duplicate image directory (use /sdk/images instead)." into...
Dirk Dougherty [Tue, 29 Jan 2013 23:09:41 +0000 (23:09 +0000)]
Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev

11 years agoDoc change: remove duplicate image directory (use /sdk/images instead).
Dirk Dougherty [Tue, 29 Jan 2013 22:26:02 +0000 (14:26 -0800)]
Doc change: remove duplicate image directory (use /sdk/images instead).

Change-Id: If987d7a31d8b9dc203e9d224a59aeeab8aa5297f

11 years agodocs: switch devsite doc build to use templates-sdk
Scott Main [Tue, 29 Jan 2013 22:20:13 +0000 (14:20 -0800)]
docs: switch devsite doc build to use templates-sdk

Change-Id: I933cbafa0712de47b4bcf72d2a7c4f99bf18f930

11 years agodocs: add hdf bool for deviste, used to change aspects of the templates
Scott Main [Tue, 29 Jan 2013 16:29:40 +0000 (08:29 -0800)]
docs: add hdf bool for deviste, used to change aspects of the templates

Change-Id: I6ad24252f10211a88d1f98e356bc9da97442f91c

11 years agoMerge "docs: update adb tool page with am and pm reference" into jb-mr1-dev
Scott Main [Tue, 29 Jan 2013 00:49:05 +0000 (00:49 +0000)]
Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev

11 years agoMerge "Add build rule for ds (devsite) online docs." into jb-mr1-dev
Dirk Dougherty [Tue, 29 Jan 2013 00:40:57 +0000 (00:40 +0000)]
Merge "Add build rule for ds (devsite) online docs." into jb-mr1-dev

11 years agoAdd build rule for ds (devsite) online docs.
Dirk Dougherty [Mon, 28 Jan 2013 23:43:49 +0000 (15:43 -0800)]
Add build rule for ds (devsite) online docs.

Change-Id: I4f1d099995402613f58401a506ba272abfb563ba

11 years agoMerge "Doc change: Add new file location for localized docs. Files in this dir are...
Dirk Dougherty [Mon, 28 Jan 2013 21:26:01 +0000 (21:26 +0000)]
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

11 years agoDoc change: Add new file location for localized docs. Files in this dir are currently...
Dirk Dougherty [Mon, 28 Jan 2013 20:19:24 +0000 (12:19 -0800)]
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.

Change-Id: Ib33511f75b72a8019fffb13d396b608cf8e270d2

11 years agoDisplaying Bitmaps Efficiently Training - Update sample app
Adam Koch [Mon, 28 Jan 2013 18:58:14 +0000 (13:58 -0500)]
Displaying Bitmaps Efficiently Training - Update sample app
Update sample app zip (see http://ag/268000)

Change-Id: I678b9286552d559358b0e58cbac0475dbe5e10a1

11 years agodocs: update adb tool page with am and pm reference
Scott Main [Thu, 10 Jan 2013 02:46:57 +0000 (18:46 -0800)]
docs: update adb tool page with am and pm reference

Change-Id: I7b0e5c95a0d98b91c0a8ed39962b52f8ace47c3b

11 years agoDoc change: Explicitly declare pages that should use the 'sdk' page template. This...
Dirk Dougherty [Thu, 29 Nov 2012 21:09:21 +0000 (13:09 -0800)]
Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.

Change-Id: I0bf0c691db8f190215f95ab8659e28fd73a496d7

11 years agoam c2469500: Merge "Touch action bar title text: you will go to space today!" into...
Adam Powell [Wed, 23 Jan 2013 23:44:47 +0000 (15:44 -0800)]
am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit 'c246950043c4c48beb51d5b56d94473e77c5fad2':
  Touch action bar title text: you will go to space today!

11 years agoMerge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
Adam Powell [Wed, 23 Jan 2013 23:42:31 +0000 (23:42 +0000)]
Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev

11 years agoam 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content...
Adam Powell [Wed, 23 Jan 2013 23:24:18 +0000 (15:24 -0800)]
am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content

11 years agoMerge "Prevent simultaneous interaction with action bar and content" into jb-mr1...
Adam Powell [Wed, 23 Jan 2013 23:20:56 +0000 (23:20 +0000)]
Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev

11 years agoTouch action bar title text: you will go to space today!
Adam Powell [Wed, 23 Jan 2013 02:55:20 +0000 (18:55 -0800)]
Touch action bar title text: you will go to space today!

Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458

11 years agoPrevent simultaneous interaction with action bar and content
Adam Powell [Wed, 23 Jan 2013 22:23:06 +0000 (14:23 -0800)]
Prevent simultaneous interaction with action bar and content

Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4

11 years agoam 596532d9: Properly initialize recognition service if the recognizer component...
Amith Yamasani [Tue, 22 Jan 2013 23:43:53 +0000 (15:43 -0800)]
am 596532d9: Properly initialize recognition service if the recognizer component changed.

* commit '596532d9dbea3460dbc989b0316c721ca69f4915':
  Properly initialize recognition service if the recognizer component changed.

11 years agoProperly initialize recognition service if the recognizer component changed.
Amith Yamasani [Fri, 18 Jan 2013 19:04:09 +0000 (11:04 -0800)]
Properly initialize recognition service if the recognizer component changed.

The getServiceInfo() call directly to IPackageManager does not throw an exception.
The return value needed to be checked for null.

Bug: 8031032
Change-Id: I701b9e8cf3b2406a3b35a486183330489b3d46f5

11 years agoam 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under Servi...
Victoria Lease [Fri, 18 Jan 2013 18:49:07 +0000 (10:49 -0800)]
am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev

* commit '0cf97d32178b689184866e731c0a4105d8223d80':
  DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.

11 years agoMerge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care."...
Victoria Lease [Fri, 18 Jan 2013 18:42:36 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev

11 years agoam a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training...
Robert Ly [Fri, 18 Jan 2013 18:28:41 +0000 (10:28 -0800)]
am a239b933: am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev

* commit 'a239b933f7982ed069ccd284b4eab0fb5e4b6505':
  docs: Add PageTransformer to animations training class

11 years agoam 548e17df: Merge "docs: Add PageTransformer to animations training class" into...
Robert Ly [Fri, 18 Jan 2013 18:23:29 +0000 (10:23 -0800)]
am 548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev

* commit '548e17dfdbd862cdfc663268a6d67b47f42b9544':
  docs: Add PageTransformer to animations training class

11 years agoMerge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
Robert Ly [Fri, 18 Jan 2013 18:20:29 +0000 (18:20 +0000)]
Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev

11 years agodocs: Add PageTransformer to animations training class
Roman Nurik [Wed, 9 Jan 2013 16:35:53 +0000 (08:35 -0800)]
docs: Add PageTransformer to animations training class

Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1

11 years agoam ee3a1d5e: am 9b6687bb: Fix code snippet
Andy McFadden [Thu, 17 Jan 2013 20:11:47 +0000 (12:11 -0800)]
am ee3a1d5e: am 9b6687bb: Fix code snippet

* commit 'ee3a1d5ecefe3d67df40c53de892b56ddf71bc81':
  Fix code snippet

11 years agoam 9b6687bb: Fix code snippet
Andy McFadden [Thu, 17 Jan 2013 20:09:40 +0000 (12:09 -0800)]
am 9b6687bb: Fix code snippet

* commit '9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
  Fix code snippet

11 years agoFix code snippet
Andy McFadden [Tue, 15 Jan 2013 20:26:04 +0000 (12:26 -0800)]
Fix code snippet

One of the examples was incorrect (both here and in the original).

http://b.android.com/42776

Change-Id: I2a218b724f50caf47d5185ef529ae8ab3104794f

11 years agoDO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Victoria Lease [Wed, 16 Jan 2013 20:51:04 +0000 (12:51 -0800)]
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.

Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

services/java/com/android/server/ServiceWatcher.java

11 years agoam 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https...
Dirk Dougherty [Thu, 17 Jan 2013 00:39:17 +0000 (16:39 -0800)]
am 4a0f95cf: am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev

* commit '4a0f95cffbb9925e95c216aea41f3450885d4061':
  Doc change: Fix urls to work properly with https.

11 years agoam 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
Dirk Dougherty [Thu, 17 Jan 2013 00:37:03 +0000 (16:37 -0800)]
am 3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev

* commit '3987f6c1793bd44305c491e9b57134a1df285599':
  Doc change: Fix urls to work properly with https.

11 years agoMerge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
Dirk Dougherty [Thu, 17 Jan 2013 00:30:09 +0000 (00:30 +0000)]
Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev

11 years agoam 3332aa98: am d7ec742c: docs: Minor typos
Scott Kennedy [Wed, 16 Jan 2013 18:09:46 +0000 (10:09 -0800)]
am 3332aa98: am d7ec742c: docs: Minor typos

* commit '3332aa985280d7e84c7cb70c33610efdd24873d7':
  docs: Minor typos

11 years agoam ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landi...
Scott Main [Wed, 16 Jan 2013 18:09:46 +0000 (10:09 -0800)]
am ceddf9f8: am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev

* commit 'ceddf9f8e824573d7e6be4b21edf0ffb89c7c929':
  docs: put new devbytes playlist on the develop landing

11 years agoam d7ec742c: docs: Minor typos
Scott Kennedy [Wed, 16 Jan 2013 18:08:08 +0000 (10:08 -0800)]
am d7ec742c: docs: Minor typos

* commit 'd7ec742c30be95da4d20930dd5000897bfe3f127':
  docs: Minor typos

11 years agodocs: put new devbytes playlist on the develop landing
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing

Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288

11 years agoDoc change: Fix urls to work properly with https.
Dirk Dougherty [Wed, 16 Jan 2013 03:57:25 +0000 (19:57 -0800)]
Doc change: Fix urls to work properly with https.

Change-Id: I8bc996dff0a0b44992987f93019a2a5be40430cd

11 years agodocs: Minor typos
Scott Kennedy [Wed, 16 Jan 2013 03:33:56 +0000 (19:33 -0800)]
docs: Minor typos

One of these was mentioned in a comment in external 40435

Change-Id: I70f41214f41a91c716d642fe389ac2d3000175f4

11 years agoam 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into...
Scott Main [Tue, 15 Jan 2013 23:25:04 +0000 (15:25 -0800)]
am 3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev

* commit '3c3995f5ab2d0bc38cd06effdd65395a6a9a0ac3':
  docs: put new devbytes playlist on the develop landing

11 years agoMerge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
Scott Main [Tue, 15 Jan 2013 23:20:23 +0000 (15:20 -0800)]
Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev

11 years agoam 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
Scott Kennedy [Tue, 15 Jan 2013 22:50:15 +0000 (14:50 -0800)]
am 39ea055f: am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev

* commit '39ea055f9e1b697db0dee197818be8de608e461f':
  docs: Another fix for external 42607

11 years agoam 9ac31a78: am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
Scott Main [Tue, 15 Jan 2013 22:50:12 +0000 (14:50 -0800)]
am 9ac31a78: am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples

* commit '9ac31a78c85f2246cf49ff4a89a91e44375b1d56':
  docs: add download ZIPs for chet's devbyte samples

11 years agoam 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
Scott Kennedy [Tue, 15 Jan 2013 22:29:20 +0000 (14:29 -0800)]
am 335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev

* commit '335da367a167d11eefb9d8127b9423093213bcc8':
  docs: Another fix for external 42607

11 years agoresolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
Xavier Ducrohet [Tue, 15 Jan 2013 22:24:56 +0000 (14:24 -0800)]
resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0

11 years agoMerge "docs: Another fix for external 42607" into jb-mr1-dev
Scott Kennedy [Tue, 15 Jan 2013 22:24:24 +0000 (14:24 -0800)]
Merge "docs: Another fix for external 42607" into jb-mr1-dev

11 years agodocs: put new devbytes playlist on the develop landing
Scott Main [Tue, 15 Jan 2013 19:18:48 +0000 (11:18 -0800)]
docs: put new devbytes playlist on the develop landing

Change-Id: I7a9c936502a7d5caaa2d0588af3cbb1c790cc288

11 years agoam ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
Scott Main [Tue, 15 Jan 2013 19:11:16 +0000 (11:11 -0800)]
am ec171f3f: docs: add download ZIPs for chet\'s devbyte samples

* commit 'ec171f3f48f49cffc49bf36d2d65a76489351034':
  docs: add download ZIPs for chet's devbyte samples

11 years agodocs: add download ZIPs for chet's devbyte samples
Scott Main [Tue, 15 Jan 2013 19:03:49 +0000 (11:03 -0800)]
docs: add download ZIPs for chet's devbyte samples

Change-Id: I06ec87729afe2c5b161ae7877f2cc012db60db2f

11 years agoam de3b69e0: Merge "Fix the single crunch command to return the right error code...
Xavier Ducrohet [Tue, 15 Jan 2013 18:49:12 +0000 (10:49 -0800)]
am de3b69e0: Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev

* commit 'de3b69e0512c00158333a223f6c53c9eac7b3d34':
  Fix the single crunch command to return the right error code.

11 years agoMerge "Fix the single crunch command to return the right error code." into jb-mr1-dev
Xavier Ducrohet [Tue, 15 Jan 2013 18:45:28 +0000 (10:45 -0800)]
Merge "Fix the single crunch command to return the right error code." into jb-mr1-dev

11 years agoFix the single crunch command to return the right error code.
Xavier Ducrohet [Tue, 15 Jan 2013 02:02:40 +0000 (18:02 -0800)]
Fix the single crunch command to return the right error code.

Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9

11 years agodocs: Another fix for external 42607
Scott Kennedy [Tue, 15 Jan 2013 16:52:37 +0000 (08:52 -0800)]
docs: Another fix for external 42607

Follow-up to If4215cef850ba8e4e8df356a68192566806e7914

Change-Id: I70a7a9f6a5be654b1fab9645c87da304b33aec5b

11 years agoam 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight...
Dirk Dougherty [Tue, 15 Jan 2013 05:26:13 +0000 (21:26 -0800)]
am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages.

* commit '9af5cf2b38d82d5ddda5ada67aab51314b473800':
  Doc change: add developer video to carousel and spotlight pages.

11 years agoam 20d47ca8: Doc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 05:24:16 +0000 (21:24 -0800)]
am 20d47ca8: Doc change: add developer video to carousel and spotlight pages.

* commit '20d47ca81df71096fd74bc9205e0e2a744cb630a':
  Doc change: add developer video to carousel and spotlight pages.

11 years agoDoc change: add developer video to carousel and spotlight pages.
Dirk Dougherty [Tue, 15 Jan 2013 01:42:30 +0000 (17:42 -0800)]
Doc change: add developer video to carousel and spotlight pages.

Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7

11 years agoam 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark...
Xia Wang [Mon, 14 Jan 2013 23:03:52 +0000 (15:03 -0800)]
am 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev

* commit '127989572079738785aecece0e9af32c9918a15b':
  Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.

11 years agoam d1a18011: Merge "Fix image processing test to include all benchmark tests -- each...
Xia Wang [Mon, 14 Jan 2013 23:00:38 +0000 (15:00 -0800)]
am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev

* commit 'd1a18011a68b2cac907d080d9044d527fd4c5853':
  Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.

11 years agoMerge "Fix image processing test to include all benchmark tests -- each test case...
Xia Wang [Mon, 14 Jan 2013 22:56:46 +0000 (14:56 -0800)]
Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev