Brett Chabot
e1bb1d3be9
Merge "Make coverage work without test defs." into jb-mr1-dev
2012-09-21 12:33:55 -07:00
Jim Miller
84fb279107
Add test case for new keyguard widget API
...
Change-Id: Ibcb19c15964f4ea4bad36ec102e9aed8b4ea9c41
2012-09-20 23:46:30 -07:00
The Android Open Source Project
6d5b5591aa
am 3ad7d24a: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3ad7d24a9f397eae674191946b999d577d21090e':
2012-09-20 12:48:51 -07:00
The Android Open Source Project
3ad7d24a9f
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I77d91a9ffb6db5b62cb01f1ddeb288dd50787a8a
2012-09-20 10:35:10 -07:00
Brett Chabot
3dd6d288f5
am f5e9dcd8: am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev
...
* commit 'f5e9dcd82939e5077d003bbcbfd13752debf857b':
Fix install of full build packages.
2012-09-20 09:29:01 -07:00
Brett Chabot
8ac51186a6
Make coverage work without test defs.
...
Change-Id: I946df038e97dc5c2f40a4610d4076e13ab6bde37
2012-09-20 08:06:05 -07:00
The Android Automerger
7281ec92ae
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-20 06:59:26 -07:00
Brett Chabot
f5e9dcd829
am 42c14447: Merge "Fix install of full build packages." into jb-mr1-dev
...
* commit '42c14447df3f46d1176675c0e021726bf6087519':
Fix install of full build packages.
2012-09-20 06:08:13 -07:00
Geremy Condra
5df6da94db
Merge "Fixed runtest to work with python != 2.4"
2012-09-20 00:19:44 -07:00
Brett Chabot
42c14447df
Merge "Fix install of full build packages." into jb-mr1-dev
2012-09-19 17:06:50 -07:00
Brett Chabot
b0b8c7816d
Fix install of full build packages.
...
Change-Id: I8296304b2297d3ac746920f5f2f70096d055a46c
2012-09-19 08:32:56 -07:00
The Android Automerger
00a159d658
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:30 -07:00
Doug Zongker
771623de18
am c7501c25: am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c7501c25717bbe456048fa84e4ea3895c2ed3b97':
center text, fix extents for multiline texts
2012-09-18 17:16:20 -07:00
Doug Zongker
c7501c2571
am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c31f70a3e4b9464742b699f0e3f92f02fee0ddd6':
center text, fix extents for multiline texts
2012-09-18 16:54:30 -07:00
Doug Zongker
c31f70a3e4
center text, fix extents for multiline texts
...
Bug: 7064142
Change-Id: I3c423c54609b28def1db56084190bf10b87f40f8
2012-09-18 15:47:52 -07:00
Doug Zongker
92d807a5d3
am 87914ead: am 608a5afb: update the localizer tool to use all available translations
...
* commit '87914eadbcec744750115032f1161d0ab14b3d1c':
update the localizer tool to use all available translations
2012-09-18 13:57:09 -07:00
Doug Zongker
87914eadbc
am 608a5afb: update the localizer tool to use all available translations
...
* commit '608a5afb925a25930f4b1a00a23276298a65c80c':
update the localizer tool to use all available translations
2012-09-18 13:48:27 -07:00
Doug Zongker
608a5afb92
update the localizer tool to use all available translations
...
Bug: 7064142
Change-Id: I606b7e2cf4bd2ab58c14af969a98089960100ff5
2012-09-18 12:40:57 -07:00
Baligh Uddin
33e9e83d46
am 9c41fd53: (-s ours) am 5f25ef04: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '9c41fd5377cbcb310e7d6d613ccc186c25990e48':
Import translations. DO NOT MERGE
2012-09-17 12:45:36 -07:00
Eino-Ville Talvala
84e08d35d7
am 7adaeb6e: am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
* commit '7adaeb6ed479f667bceaae0af27fa997eb6afea6':
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
2012-09-17 11:09:05 -07:00
The Android Automerger
4269b2151c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-16 06:59:25 -07:00
Baligh Uddin
9c41fd5377
am 5f25ef04: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c':
Import translations. DO NOT MERGE
2012-09-14 16:10:18 -07:00
Baligh Uddin
5f25ef0412
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-14 16:08:28 -07:00
The Android Automerger
0dfbeaac58
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 14:10:12 -07:00
Baligh Uddin
c6c0faafcf
Import translations. DO NOT MERGE
...
Change-Id: I6805981e7891a3eb4a304e2273f4bdbd04ecb254
Auto-generated-cl: translation import
2012-09-14 13:42:57 -07:00
Baligh Uddin
c2760a00ea
Import translations. DO NOT MERGE
...
Change-Id: I90a11fad1986532f4895f7b7edf682364d387faa
Auto-generated-cl: translation import
2012-09-14 13:42:32 -07:00
Eino-Ville Talvala
7adaeb6ed4
am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
* commit 'd6046a445fe4e2896cfbd66cf7d5e0545ab34af2':
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
2012-09-14 11:33:35 -07:00
The Android Automerger
23ab3c9d70
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 07:11:06 -07:00
Eino-Ville Talvala
d6046a445f
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
Emulator does not need FORMAT_ZSL, so treat it as
IMPLEMENTATION_DEFINED.
Bug: 6243944
Change-Id: I9eeb48f6197ff9979f7823b8dc912346158fd6f1
2012-09-13 16:33:26 -07:00
Brett Chabot
98ab0fc7e7
am 43655b87: am 91615e7f: Merge "Fix log syntax." into jb-mr1-dev
...
* commit '43655b8774dc5cd20885f0e600e4b2b4b31378de':
Fix log syntax.
2012-09-13 14:12:07 -07:00
Dirk Dougherty
71f5cff534
am 2bac0954: am f9149152: am cebc0dc6: am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
...
* commit '2bac095435c43f3988f3cc0f6bd07ed237fe87e8':
Doc change: Add temporary redirect for dac/live to dgc/live.
2012-09-13 14:04:35 -07:00
Brett Chabot
43655b8774
am 91615e7f: Merge "Fix log syntax." into jb-mr1-dev
...
* commit '91615e7f5a7d55ffa349168108636084bfae25e4':
Fix log syntax.
2012-09-13 10:11:37 -07:00
Brett Chabot
91615e7f5a
Merge "Fix log syntax." into jb-mr1-dev
2012-09-13 10:10:07 -07:00
Brett Chabot
81c475e4ac
Fix log syntax.
...
And add better error message when instrumentation test is not
present.
Change-Id: I381421e59a3b667a5c3090ccd49e38fe99d680c5
2012-09-13 09:47:25 -07:00
The Android Automerger
8f394874ff
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 06:59:26 -07:00
Dirk Dougherty
2bac095435
am f9149152: am cebc0dc6: am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
...
* commit 'f91491520dd7b488072841af0b6dc4651cb96441':
Doc change: Add temporary redirect for dac/live to dgc/live.
2012-09-12 18:02:53 -07:00
Dirk Dougherty
f91491520d
am cebc0dc6: am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
...
* commit 'cebc0dc6525fea3738f4f21c2508cf982def718a':
Doc change: Add temporary redirect for dac/live to dgc/live.
2012-09-12 18:00:12 -07:00
Dirk Dougherty
cebc0dc652
am 09bb223b: Doc change: Add temporary redirect for dac/live to dgc/live.
...
* commit '09bb223b97daf467e81ccffc4905b5dfb46d9e8d':
Doc change: Add temporary redirect for dac/live to dgc/live.
2012-09-12 17:58:53 -07:00
Craig Mautner
8f7f63976e
am 3ae6305b: am 51f88338: Make Presentation demo retain image and color.
...
* commit '3ae6305bd59c5d023d10087c3940d8cf57eda74f':
Make Presentation demo retain image and color.
2012-09-12 17:03:14 -07:00
The Android Open Source Project
d05502a032
am 475a35c8: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '475a35c8cdad85d831e5f8c8378ea56aa17b3bf8':
2012-09-12 16:58:48 -07:00
Craig Mautner
bcabe7f676
am cb08b632: am 9dac35ad: New and improved Presentation demo.
...
* commit 'cb08b63257f33281d48d09e79de6b30fbdfa32ce':
New and improved Presentation demo.
2012-09-12 15:36:18 -07:00
Craig Mautner
3ae6305bd5
am 51f88338: Make Presentation demo retain image and color.
...
* commit '51f883381dba5b4fa9c87331a6f8cfd94868dd1f':
Make Presentation demo retain image and color.
2012-09-12 13:50:07 -07:00
Dirk Dougherty
09bb223b97
Doc change: Add temporary redirect for dac/live to dgc/live.
...
Change-Id: I5a999abb6228f9a2b5d589e6e51176ecf930abe4
2012-09-12 09:24:04 -07:00
The Android Open Source Project
475a35c8cd
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I090c4533cd67bd4fb1c98cd2d950a70ac85b7e85
2012-09-12 07:39:51 -07:00
The Android Automerger
83dff9c28c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 06:59:24 -07:00
Craig Mautner
51f883381d
Make Presentation demo retain image and color.
...
Store which Displays are presenting, their images and their
background colors. That way the don't change between onPause
and onResume.
Change-Id: I01328583ef309bf12e7f5750aa4abea50f847a99
2012-09-11 22:13:09 -07:00
Craig Mautner
cb08b63257
am 9dac35ad: New and improved Presentation demo.
...
* commit '9dac35adda0e21d5b1b497261042eefd53e77535':
New and improved Presentation demo.
2012-09-11 22:01:07 -07:00
Geremy Condra
01844b15d9
Fixed runtest to work with python != 2.4
...
Change-Id: I6104adb5a6549eb4eaa3f2096633a49e4743ce50
2012-09-11 15:24:25 -07:00
Craig Mautner
9dac35adda
New and improved Presentation demo.
...
Less clutter, bigger letters!
Change-Id: Ie0d5626c6a83a0e96bbda9220aea1f945c1bd825
2012-09-11 14:53:03 -07:00
The Android Automerger
337cd080cd
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 06:59:19 -07:00