Commit Graph

12088 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Dianne Hackborn
008e53dc4d am 201bb0f7: am 39e3b7fe: Merge "Remove use of private API." into jb-mr1-dev
* commit '201bb0f7bbf2b3e10c364f5da19ce5e760035381':
  Remove use of private API.
2012-09-10 17:16:14 -07:00
Dirk Dougherty
6b4e997189 am a6cbfb65: am a97806b5: am 0d2631d3: am bc93334b: Doc change: redirect accessibility best practices to new location.
* commit 'a6cbfb65a636a5b68e94a8514a694fec8c972a93':
  Doc change: redirect accessibility best practices to new location.
2012-09-10 17:15:14 -07:00
Brett Chabot
50d6116745 am 7bfaffd6: am 08e5a8ae: Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
* commit '7bfaffd6357ab18bfd68ef23fd0c6890bd0d8783':
  Coverage and unbundling changes for runtest.
2012-09-10 17:13:54 -07:00
Dianne Hackborn
b0ca81cc4b am 63e79a62: am bd783a0e: New API demo for nested fragments in support lib.
* commit '63e79a625368a39bf29f7aee014669de79d0a1cb':
  New API demo for nested fragments in support lib.
2012-09-10 17:11:57 -07:00
Dianne Hackborn
6764197565 am 6852ac74: am 077c59a0: Track multi-user change.
* commit '6852ac7430cdf909a223e6ba9d9ec9b9ca22e46a':
  Track multi-user change.
2012-09-10 17:06:25 -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
201bb0f7bb am 39e3b7fe: Merge "Remove use of private API." into jb-mr1-dev
* commit '39e3b7fe2323fbb067847aba9b1b5bb3d072a91d':
  Remove use of private API.
2012-09-10 15:08:30 -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
a6cbfb65a6 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:15:58 -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
7bfaffd635 am 08e5a8ae: Merge "Coverage and unbundling changes for runtest." into jb-mr1-dev
* commit '08e5a8ae69a8d6f9d50cc84768c85a73ddfa748f':
  Coverage and unbundling changes for runtest.
2012-09-10 07:59:59 -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
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
63e79a6253 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: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
15f0e2455e am 077c59a0: Track multi-user change.
* commit '077c59a0b9351cb0a6fe0098de3b9591ddaaf4f0':
  Track multi-user change.
2012-09-07 16:42:44 -07:00
Dianne Hackborn
6852ac7430 am 077c59a0: Track multi-user change.
* commit '077c59a0b9351cb0a6fe0098de3b9591ddaaf4f0':
  Track multi-user change.
2012-09-07 14:14:04 -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
Andrew Hsieh
bc9d176568 am c29e27ad: am 17a180c9: am a295480f: am 4102c6f2: am b833605a: Merge "Rewrite ARM crtbegin* as C files"
* commit 'c29e27ad4194ced54c54a0e021593505f3dda305':
  Rewrite ARM crtbegin* as C files
2012-09-06 18:38:23 -07:00
Andrew Hsieh
c29e27ad41 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-06 18:36:12 -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