Jim Miller
ceff47f2b7
am 81a6b985: Merge "Add test case for new keyguard widget API" into jb-mr1-dev
...
* commit '81a6b985e4abef7b2be291eb8aa0b85cc78cfd2a':
Add test case for new keyguard widget API
2012-09-21 17:49:02 -07:00
Brett Chabot
da07f2624b
am 99f717d7: Fix runtest syntax.
...
* commit '99f717d7d88cdfe55b5a9689544dceac9489f614':
Fix runtest syntax.
2012-09-21 17:47:47 -07:00
Brett Chabot
6a1c1d1217
am e1bb1d3b: Merge "Make coverage work without test defs." into jb-mr1-dev
...
* commit 'e1bb1d3be9013226cc5750dc10cebe45c634765d':
Make coverage work without test defs.
2012-09-21 17:47:38 -07:00
Jim Miller
81a6b985e4
Merge "Add test case for new keyguard widget API" into jb-mr1-dev
2012-09-21 15:22:28 -07:00
Brett Chabot
99f717d7d8
Fix runtest syntax.
...
Change-Id: Ief41103c14c30d53f6c2fe8af5511386d57894c2
2012-09-21 13:01:03 -07:00
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
Brett Chabot
8ac51186a6
Make coverage work without test defs.
...
Change-Id: I946df038e97dc5c2f40a4610d4076e13ab6bde37
2012-09-20 08:06:05 -07:00
Brett Chabot
6501dc6e07
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:22:00 -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
Doug Zongker
c93f5d847e
am c31f70a3: center text, fix extents for multiline texts
...
* commit 'c31f70a3e4b9464742b699f0e3f92f02fee0ddd6':
center text, fix extents for multiline texts
2012-09-18 15:58:11 -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
Baligh Uddin
10562f5f65
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-18 14:45:47 -07:00
Doug Zongker
7b0a137a67
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 14:03:59 -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
cb5b7238a3
Import translations. DO NOT MERGE
...
Change-Id: I11f57138ffae5810804fa375d23d6c80f2d67a29
Auto-generated-cl: translation import
2012-09-18 11:31:06 -07:00
Baligh Uddin
c705b4190b
am 5f25ef04: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5f25ef041243c52fc97b5e3cdea0dfa3af64245c':
Import translations. DO NOT MERGE
2012-09-14 16:10:23 -07:00
Baligh Uddin
5f25ef0412
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-14 16:08:28 -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
ebd423f29b
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:46 -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
5f3544a3e8
am 91615e7f: Merge "Fix log syntax." into jb-mr1-dev
...
* commit '91615e7f5a7d55ffa349168108636084bfae25e4':
Fix log syntax.
2012-09-13 10:11:47 -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
Dirk Dougherty
69b48fd1ac
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:43 -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
8b93073bf8
am 51f88338: Make Presentation demo retain image and color.
...
* commit '51f883381dba5b4fa9c87331a6f8cfd94868dd1f':
Make Presentation demo retain image and color.
2012-09-12 13:50:19 -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
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
777d39041d
am 9dac35ad: New and improved Presentation demo.
...
* commit '9dac35adda0e21d5b1b497261042eefd53e77535':
New and improved Presentation demo.
2012-09-11 22:01:46 -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
Dianne Hackborn
06a0e739af
am 39e3b7fe: Merge "Remove use of private API." into jb-mr1-dev
...
* commit '39e3b7fe2323fbb067847aba9b1b5bb3d072a91d':
Remove use of private API.
2012-09-10 15:08:40 -07:00
Dianne Hackborn
39e3b7fe23
Merge "Remove use of private API." into jb-mr1-dev
2012-09-10 15:06:44 -07:00
Dianne Hackborn
d0689c0328
Remove use of private API.
...
Change-Id: I6c1e586af108cb1d94120295181d89c5050f5bc2
2012-09-10 14:43:16 -07:00
Dirk Dougherty
b737e9ae1a
am a97806b5: am 0d2631d3: am bc93334b: Doc change: redirect accessibility best practices to new location.
...
* commit 'a97806b5f94419016126582f17f0d4ff1a671322':
Doc change: redirect accessibility best practices to new location.
2012-09-10 12:16:41 -07:00
Dirk Dougherty
a97806b5f9
am 0d2631d3: am bc93334b: Doc change: redirect accessibility best practices to new location.
...
* commit '0d2631d3ca8b18e90b1fd3ee1396e0ab2064ae20':
Doc change: redirect accessibility best practices to new location.
2012-09-10 12:14:05 -07:00
Dirk Dougherty
0d2631d3ca
am bc93334b: Doc change: redirect accessibility best practices to new location.
...
* commit 'bc93334be2beddcd3406301c9d9a1de9824450e9':
Doc change: redirect accessibility best practices to new location.
2012-09-10 12:12:55 -07:00
Dirk Dougherty
bc93334be2
Doc change: redirect accessibility best practices to new location.
...
Change-Id: I4c4d96ed07ecd4640f98d3c5a719cb24f48ab94f
2012-09-10 12:02:50 -07:00
Brett Chabot
8292944524
am 08e5a8ae: Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
...
* commit '08e5a8ae69a8d6f9d50cc84768c85a73ddfa748f':
Coverage and unbundling changes for runtest.
2012-09-10 08:00:07 -07:00
Brett Chabot
08e5a8ae69
Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
2012-09-10 07:58:47 -07:00
Dianne Hackborn
80e53ea241
am bd783a0e: New API demo for nested fragments in support lib.
...
* commit 'bd783a0e87ea6c9d56e24c313e251d993bf04d3c':
New API demo for nested fragments in support lib.
2012-09-09 14:47:44 -07:00
Dianne Hackborn
bd783a0e87
New API demo for nested fragments in support lib.
...
Also some cleanup of other demos.
Change-Id: I8c4265218c87e490718c9c908803fc09303873a6
2012-09-09 14:41:24 -07:00
Dianne Hackborn
15f0e2455e
am 077c59a0: Track multi-user change.
...
* commit '077c59a0b9351cb0a6fe0098de3b9591ddaaf4f0':
Track multi-user change.
2012-09-07 16:42:44 -07:00
Andrew Hsieh
77f57cecf9
am 17a180c9: am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
...
* commit '17a180c959e0e0165472a6bd47d2443478a6eb27':
Rewrite ARM crtbegin* as C files
2012-09-07 13:45:19 -07:00
Dianne Hackborn
e962996204
am 51f241cb: Merge "API demo for nesting fragments." into jb-mr1-dev
...
* commit '51f241cbee24727175f5ef369e312d21363f6272':
API demo for nesting fragments.
2012-09-07 13:42:24 -07:00
Eino-Ville Talvala
edf26f5255
am cfd8132a: Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev
...
* commit 'cfd8132af00e517a5442a5a077354dac40b1aa21':
EmulatedFakeCamera2: Split AE/AWB mode and lock
2012-09-07 13:42:17 -07:00
The Android Open Source Project
ad213c98a9
am 310bc879: (-s ours) am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
...
* commit '310bc879f95291339f1efe34ddc8f7fa2ba8fdf9':
2012-09-07 13:41:06 -07:00
Dianne Hackborn
077c59a0b9
Track multi-user change.
...
Change-Id: I0b45ec880f6149fba5d2d83c014e1e71a6524b99
2012-09-07 13:08:27 -07:00