Commit Graph

10491 Commits

Author SHA1 Message Date
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
c31f70a3e4 center text, fix extents for multiline texts
Bug: 7064142
Change-Id: I3c423c54609b28def1db56084190bf10b87f40f8
2012-09-18 15:47:52 -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
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
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
c2760a00ea Import translations. DO NOT MERGE
Change-Id: I90a11fad1986532f4895f7b7edf682364d387faa
Auto-generated-cl: translation import
2012-09-14 13:42:32 -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
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
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
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 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
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
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
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
08e5a8ae69 Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev 2012-09-10 07:58:47 -07:00
The Android Automerger
15d4e75c4d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-10 06:59:11 -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
The Android Automerger
4d01f849ef merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-09 06:59:45 -07:00
Dianne Hackborn
077c59a0b9 Track multi-user change.
Change-Id: I0b45ec880f6149fba5d2d83c014e1e71a6524b99
2012-09-07 13:08:27 -07:00
Andrew Hsieh
17a180c959 am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
* commit 'a295480fa627e4f0fac0a3a5f992b9e69b4fc062':
  Rewrite ARM crtbegin* as C files
2012-09-06 18:33:46 -07:00
Andrew Hsieh
a295480fa6 am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
* commit '4102c6f241153cb04e2fad7900ffbc07841c1381':
  Rewrite ARM crtbegin* as C files
2012-09-06 18:31:47 -07:00
Andrew Hsieh
4102c6f241 am b833605a: Merge "Rewrite ARM crtbegin* as C files"
* commit 'b833605a2bf5c27ff57cf5508fc58bca351c2470':
  Rewrite ARM crtbegin* as C files
2012-09-06 18:30:03 -07:00
Andrew Hsieh
b833605a2b Merge "Rewrite ARM crtbegin* as C files" 2012-09-06 18:14:38 -07:00
Dianne Hackborn
51f241cbee Merge "API demo for nesting fragments." into jb-mr1-dev 2012-09-06 11:44:22 -07:00
Eino-Ville Talvala
cfd8132af0 Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev 2012-09-06 11:42:46 -07:00
Dianne Hackborn
f3f7c5f775 API demo for nesting fragments.
Change-Id: I7f20e4f00cf68c78c578ae620a95de7fa97f0761
2012-09-06 11:39:30 -07:00
The Android Open Source Project
310bc879f9 am 51535bf8: (-s ours) Reconcile with jb-release - do not merge
* commit '51535bf8ad7d950e05df7c16e4e6a35effc29e83':
2012-09-06 09:11:31 -07:00
The Android Open Source Project
51535bf8ad Reconcile with jb-release - do not merge
Change-Id: I2d47692562ca20d2e2e356ae569a2dbf1caeef0c
2012-09-06 08:08:14 -07:00
Andrew Hsieh
d0b834c7ad Rewrite ARM crtbegin* as C files
This is port of related CLs:
  9d40326830c2bd407427889c554adeb915ee6b4a
  f3cfcd869ded41d25c1f4f4e48e7c374a64f9583

Summary: By placing  __PREINIT_ARRAY__, __INIT_ARRAY__, __FINI_ARRAY__
and __CTOR_LIST__ on stack, this change allows PIC w/o relying on text
relocations.

Change-Id: I02a1b496b16aba692f4f9fa998a71efd943689fd
2012-09-06 15:27:56 +08:00
The Android Automerger
52f99e55cc merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-05 06:33:32 -07:00
Eino-Ville Talvala
7002083f08 Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev 2012-09-04 16:22:12 -07:00
Eino-Ville Talvala
f8ddf2e538 Merge "Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""" into jb-mr1-dev 2012-09-04 16:22:12 -07:00
Eino-Ville Talvala
f11b793ffb Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""
Missing project ready to go.

This reverts commit 75832395dd

Change-Id: I48f6dee11248de5a12b66bd7fbc724c82517fe3a
2012-09-04 14:21:30 -07:00
Eino-Ville Talvala
18f28c0c21 Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""
Missing project ready to go.

This reverts commit 9642da5102

Change-Id: I08a43e9cdcb06bd6b74fd08809bbaf801c2eb44f
2012-09-04 14:21:19 -07:00
Eino-Ville Talvala
f0063b298b Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev 2012-09-04 12:28:05 -07:00
Eino-Ville Talvala
7b8420e2ab Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev 2012-09-04 12:27:56 -07:00
Eino-Ville Talvala
9642da5102 Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
More dependent projects than I realized

This reverts commit a84522d2f3

Change-Id: Ifb50c94a2a5dfa91573f07695d8f3bfcadc79742
2012-09-04 12:27:04 -07:00
Eino-Ville Talvala
75832395dd Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
More dependent projects than I realized.

This reverts commit 4573a7194d

Change-Id: I53cfbc5cf5ef4436f5fa0c8b1ceb6296797e32fe
2012-09-04 12:26:21 -07:00
Eino-Ville Talvala
c07123b1ef Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev 2012-09-04 12:25:18 -07:00
Eino-Ville Talvala
4604e30da0 Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev 2012-09-04 12:07:25 -07:00