OSDN Git Service
Dirk Dougherty [Fri, 1 Feb 2013 22:25:25 +0000 (14:25 -0800)]
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.
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.
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.
Xia Wang [Thu, 31 Jan 2013 02:59:22 +0000 (18:59 -0800)]
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:
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:
Xia Wang [Thu, 31 Jan 2013 02:54:55 +0000 (02:54 +0000)]
Merge "Fix WiFi test:" into jb-mr1.1-dev
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
Doug Zongker [Tue, 29 Jan 2013 17:05:21 +0000 (09:05 -0800)]
add android.permission.LOOP_RADIO for access to loop radio device
Change-Id: I811d70fa67aa758122678809f32b8aade42ced0f
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
Adam Powell [Wed, 23 Jan 2013 23:46:20 +0000 (15:46 -0800)]
am
17f05497: am
c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
17f05497be90004c0263c6de173af8c19ece07b0':
Touch action bar title text: you will go to space today!
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!
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
Adam Powell [Wed, 23 Jan 2013 23:25:50 +0000 (15:25 -0800)]
am
65083049: am
5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '
650830491868b961e98c1837fb4b4ce7917783b5':
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
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
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
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
Amith Yamasani [Tue, 22 Jan 2013 23:46:25 +0000 (15:46 -0800)]
am
2c64b539: am
596532d9: Properly initialize recognition service if the recognizer component changed.
* commit '
2c64b53976a99f28bc7c0612648581f9b93bf8b0':
Properly initialize recognition service if the recognizer component changed.
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.
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
Dake Gu [Fri, 18 Jan 2013 21:22:26 +0000 (21:22 +0000)]
Merge "Fix bug of SimulatedTrackball" into jb-mr1-aah-dev
Victoria Lease [Fri, 18 Jan 2013 18:51:25 +0000 (10:51 -0800)]
am
3599f0a0: (-s ours) am
0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev
* commit '
3599f0a02129c238177806ce3d6db20853230d4d':
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
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.
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
Robert Ly [Fri, 18 Jan 2013 18:31:48 +0000 (10:31 -0800)]
am
6d59e0ea: am
a239b933: am
548e17df: Merge "docs: Add PageTransformer to animations training class" into jb-mr1-dev
* commit '
6d59e0ead242978eff8a64d314a1f8554694d8a6':
docs: Add PageTransformer to animations training class
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
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
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
Dake Gu [Thu, 17 Jan 2013 21:39:01 +0000 (13:39 -0800)]
Fix bug of SimulatedTrackball
Simulated trackball should not generate KeyEvent if dispatchGenericMotionEvent
returns true
b/
8022205
Change-Id: I1857e25407c508c98ef4db85fe146b1e25a0803e
Roman Nurik [Wed, 9 Jan 2013 16:35:53 +0000 (08:35 -0800)]
docs: Add PageTransformer to animations training class
Change-Id: I01f7e5b1fa078d9219edf190e5e8444192cc55f1
Andy McFadden [Thu, 17 Jan 2013 20:14:24 +0000 (12:14 -0800)]
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
Andy McFadden [Thu, 17 Jan 2013 20:09:40 +0000 (12:09 -0800)]
am
9b6687bb: Fix code snippet
* commit '
9b6687bbc6a3e2866fdfd8ac3c725138d4c7ecbf':
Fix code snippet
Dirk Dougherty [Thu, 17 Jan 2013 19:55:49 +0000 (11:55 -0800)]
am
ce15192c: am
4a0f95cf: am
3987f6c1: Merge "Doc change: Fix urls to work properly with https." into jb-mr1-dev
* commit '
ce15192c72a3491f632d8cee89f2f58da1e4e0b6':
Doc change: Fix urls to work properly with https.
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
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
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.
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.
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
Justin Koh [Thu, 17 Jan 2013 00:11:44 +0000 (00:11 +0000)]
Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
Justin Koh [Wed, 16 Jan 2013 22:51:29 +0000 (14:51 -0800)]
Remove doSingleCrunch call DO NOT MERGE
Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.
Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a
Scott Kennedy [Wed, 16 Jan 2013 18:13:02 +0000 (10:13 -0800)]
Scott Main [Wed, 16 Jan 2013 18:12:59 +0000 (10:12 -0800)]
am
841c3491: am
ceddf9f8: am
3c3995f5: Merge "docs: put new devbytes playlist on the develop landing" into jb-mr1-dev
* commit '
841c3491143e4946586caa7fe7cd4691d044ce62':
docs: put new devbytes playlist on the develop landing
Scott Main [Wed, 16 Jan 2013 18:12:56 +0000 (10:12 -0800)]
am
de902da2: docs: put new devbytes playlist on the develop landing
* commit '
de902da2c1f9e133de69267b5dbb122bce15adbc':
docs: put new devbytes playlist on the develop landing
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
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
Scott Kennedy [Wed, 16 Jan 2013 18:08:08 +0000 (10:08 -0800)]
am
d7ec742c: docs: Minor typos
* commit '
d7ec742c30be95da4d20930dd5000897bfe3f127':
docs: Minor typos
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
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
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
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
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
Scott Kennedy [Tue, 15 Jan 2013 22:52:32 +0000 (14:52 -0800)]
am
ff5b7393: am
39ea055f: am
335da367: Merge "docs: Another fix for external 42607" into jb-mr1-dev
* commit '
ff5b73933a0444aae30e3a1a41bb31d19f7ff649':
docs: Another fix for external 42607
Scott Main [Tue, 15 Jan 2013 22:52:29 +0000 (14:52 -0800)]
am
946d68f3: am
9ac31a78: am
ec171f3f: docs: add download ZIPs for chet\'s devbyte samples
* commit '
946d68f3d0e0a10753cc6566766f149d779f45b6':
docs: add download ZIPs for chet's devbyte samples
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
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
Xavier Ducrohet [Tue, 15 Jan 2013 22:48:02 +0000 (14:48 -0800)]
am
6080cc5f: resolved conflicts for merge of
dd52dfed to jb-mr1.1-ub-dev
* commit '
6080cc5fd7c332c79098a50605c0c37d99d4c481':
Fix the single crunch command to return the right error code.
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
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
Scott Kennedy [Tue, 15 Jan 2013 22:24:24 +0000 (14:24 -0800)]
Merge "docs: Another fix for external 42607" into jb-mr1-dev
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
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
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
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.
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
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
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
Dirk Dougherty [Tue, 15 Jan 2013 05:28:11 +0000 (21:28 -0800)]
am
5941ff03: am
9af5cf2b: am
20d47ca8: Doc change: add developer video to carousel and spotlight pages.
* commit '
5941ff03721005228072dca5b1c808cb5d12a001':
Doc change: add developer video to carousel and spotlight pages.
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.
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.
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
Jeff Brown [Mon, 14 Jan 2013 21:50:37 +0000 (13:50 -0800)]
Optimize focused input event dispatch in view root. DO NOT MERGE
The efficiency of key, trackball and generic motion event
dispatch is greatly influenced by the IME dispatch cycle.
This change simplifies the dispatch of focused input events
and avoids causing event processing to be requeued on the
handler and delayed unnecessarily.
Bug:
7984576
Change-Id: Id82624a3f32c05efe6ee5c322bd55bf2ab21525d
Xia Wang [Mon, 14 Jan 2013 23:11:44 +0000 (15:11 -0800)]
am
b88564d2: 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 '
b88564d21040f86a257c15a540b847417a2c2c88':
Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
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.
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.
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
Xia Wang [Wed, 21 Nov 2012 03:03:06 +0000 (19:03 -0800)]
Fix image processing test to include all benchmark tests
-- each test case can be excuted separately
-- add a test case to run all benchmarks.
DO NOT MERGE
Change-Id: I3c61dfe50267a6db11bc1895a4f37ed618a9103b
Scott Kennedy [Mon, 14 Jan 2013 19:13:25 +0000 (11:13 -0800)]
am
8e45679a: am
026f9191: am
08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '
8e45679adfe03271dd1cc627d6c4542649a0446a':
docs: Fix a bunch of issues
Scott Kennedy [Mon, 14 Jan 2013 19:11:26 +0000 (11:11 -0800)]
am
026f9191: am
08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '
026f91915f2ad710b93284b9a604d3c39161b2ed':
docs: Fix a bunch of issues
Scott Kennedy [Mon, 14 Jan 2013 19:09:27 +0000 (11:09 -0800)]
am
08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev
* commit '
083426980dbe6607a0cfc8b4ec5944d5b414ecbe':
docs: Fix a bunch of issues
Scott Kennedy [Mon, 14 Jan 2013 19:05:46 +0000 (11:05 -0800)]
Merge "docs: Fix a bunch of issues" into jb-mr1-dev
Scott Main [Mon, 14 Jan 2013 18:29:35 +0000 (10:29 -0800)]
am
ad288632: am
1357617c: am
07ee7d17: docs: Hide Arabic and Hebrew badges due to translation problems
* commit '
ad2886325081a47ebb173468717d66a0486dcf9c':
docs: Hide Arabic and Hebrew badges due to translation problems
Scott Main [Mon, 14 Jan 2013 18:27:35 +0000 (10:27 -0800)]
am
1357617c: am
07ee7d17: docs: Hide Arabic and Hebrew badges due to translation problems
* commit '
1357617c786eb4a48c214bdacf6a2543053e8be4':
docs: Hide Arabic and Hebrew badges due to translation problems
Scott Main [Mon, 14 Jan 2013 18:25:38 +0000 (10:25 -0800)]
am
07ee7d17: docs: Hide Arabic and Hebrew badges due to translation problems
* commit '
07ee7d17ac9e045bdbc08290df3275bbb4013e33':
docs: Hide Arabic and Hebrew badges due to translation problems
Scott Main [Mon, 14 Jan 2013 18:16:59 +0000 (10:16 -0800)]
docs: Hide Arabic and Hebrew badges due to translation problems
Change-Id: I0257b19bb08348bef5ddb500f00a165255e473f8
Adam Koch [Mon, 14 Jan 2013 17:31:23 +0000 (09:31 -0800)]
am
7e421365: am
1a551b16: am
6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation
* commit '
7e4213655b19255218808afc6ccfa4e40e777e93':
Displaying Bitmaps Efficiently Training - Change memory calculation
Adam Koch [Mon, 14 Jan 2013 17:28:28 +0000 (09:28 -0800)]
am
1a551b16: am
6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation
* commit '
1a551b1614a1717fab7955bb712f8f8b35e22be9':
Displaying Bitmaps Efficiently Training - Change memory calculation
Adam Koch [Mon, 14 Jan 2013 14:15:20 +0000 (06:15 -0800)]
am
6f680f52: Displaying Bitmaps Efficiently Training - Change memory calculation
* commit '
6f680f524a66dabcf0d86d0f19f3855f8c5e594f':
Displaying Bitmaps Efficiently Training - Change memory calculation
Scott Kennedy [Sat, 12 Jan 2013 06:31:43 +0000 (22:31 -0800)]
docs: Fix a bunch of issues
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441
Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
Adam Koch [Fri, 11 Jan 2013 21:53:37 +0000 (16:53 -0500)]
Displaying Bitmaps Efficiently Training - Change memory calculation
When calculating memory cache size, use Runtime.maxMemory() instead
of getMemoryClass() which is a more accurate value of available VM
heap size.
Bug:
7988323
Change-Id: Iaa9681a11aad5cad3857dfe76f0b8e4811b2243c
Satoshi Kataoka [Fri, 11 Jan 2013 02:17:35 +0000 (18:17 -0800)]
am
2495d08a: am
5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
* commit '
2495d08a5c06556deb7c3993add337037b8b492e':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
Satoshi Kataoka [Fri, 11 Jan 2013 02:15:11 +0000 (18:15 -0800)]
am
5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
* commit '
5327322ab94711a654d41a5b53be3bf6a3a28a39':
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
Satoshi Kataoka [Fri, 11 Jan 2013 02:12:43 +0000 (18:12 -0800)]
Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev
Sascha Prueter [Thu, 10 Jan 2013 19:16:51 +0000 (11:16 -0800)]
am
d692ea6d: am
b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
* commit '
d692ea6dd297fbd39885525a29bdf6637a3640f2':
Improve heuristics for detecting wireless chargers.
Sascha Prueter [Thu, 10 Jan 2013 19:14:53 +0000 (11:14 -0800)]
am
b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
* commit '
b5e4835e3a4ff37693891a59841fcefa5c3aa648':
Improve heuristics for detecting wireless chargers.
Sascha Prueter [Thu, 10 Jan 2013 19:11:20 +0000 (11:11 -0800)]
Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev
Jeff Brown [Thu, 10 Jan 2013 02:46:37 +0000 (18:46 -0800)]
Improve heuristics for detecting wireless chargers.
On some devices, we need to apply heuristics to determine whether
the device is docked on a wireless charger because the charging
circuits do not provide sufficient information to know whether
the device is on the charger unless it is actually receiving
power.
The previous heuristics only considered the battery level to
suppress spurious dock signals.
The new heuristics also take into account whether the device
appears to have moved from its previous position on the dock.
Bug:
7744185
Change-Id: I5ba885dac25b37840b6db46b8a0f30968a06776c
Adam Koch [Thu, 10 Jan 2013 14:32:43 +0000 (06:32 -0800)]
am
2d255b7e: am
ec7ffa14: am
0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
* commit '
2d255b7e1fb1cb1ceb64a962f672f145eab585e8':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
Adam Koch [Thu, 10 Jan 2013 14:30:30 +0000 (06:30 -0800)]
am
ec7ffa14: am
0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
* commit '
ec7ffa145572eae2566cb1c763bcf50d8d1e8d6b':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
Adam Koch [Thu, 10 Jan 2013 14:26:46 +0000 (06:26 -0800)]
am
0bb4dade: Displaying Bitmaps Efficiently Training - Fix inSampleSize selection
* commit '
0bb4dade30d3413cc7951c5d2c0ee761a93ae468':
Displaying Bitmaps Efficiently Training - Fix inSampleSize selection