The Android Automerger
6aa2a9c781
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:19 -07:00
Andy Stadler
de479873e5
Classpath cleanups - DO NOT MERGE
...
* Add external/mp4parser
* Cleanup after Email rewinding
This does not affect system image builds at all - just fixes eclipse
workspace so there are no errors reported.
Change-Id: I2aee831e460b4acb63b2b999bab4131a08af6bd9
2012-10-02 16:40:54 -07:00
The Android Automerger
071fde625a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:19 -07:00
Baligh Uddin
6b03c84e6e
Use more secure exponent for generating keys
...
Bug: 7246090
Change-Id: Ic6cbac975fcb96b436e27a87b1f81b5e3dac6321
2012-09-28 11:30:10 -07:00
The Android Automerger
708cf98801
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-27 06:59:22 -07:00
Jeff Sharkey
7b4874660e
Clean up Global settings stragglers.
...
Bug: 7242121
Change-Id: I27fd307e2ee4854558a6f6e4d2fdbbae3e89ffe0
2012-09-26 17:10:48 -07:00
The Android Automerger
7862fb2a20
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-26 06:59:17 -07:00
Adam Momtaz
2854254004
Merge "Added UiAutomator samples to SDK" into jb-mr1-dev
2012-09-25 19:06:57 -07:00
Adam Momtaz
8213206c6e
Added UiAutomator samples to SDK
...
Verified tests are building OK.
Change-Id: I838e44e84b3d9e2e503bff4ed2b95887996d8801
2012-09-25 17:15:17 -07:00
Dianne Hackborn
7263dad223
Update API demos to match new tab interaction.
...
Follow changes to FragmentTabManager to continue to work
correctly with it. Fix the code in the base API demo (which
can't use FragmentTabManager) to work correctly.
Bug #7232088 : ListView saved state being lost in some cases
Change-Id: Ib7ba1ab20ff00f2cc95c9f6024ab94783237c9be
2012-09-25 15:07:06 -07:00
The Android Automerger
9babfd842c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 06:59:23 -07:00
Andy Stadler
e61482e7e5
Fix .classpath to track bouncycastle/bcprov
...
Change-Id: If8d142ebc96eb76f1e0b12a8d741f2e91b5d8598
2012-09-24 17:34:26 -07:00
Xavier Ducrohet
34580b76b6
am fa82c449: am 45825eae: Update platform-tools sdk comp to 15.
...
* commit 'fa82c449aefa2a5d47d2342318a64ecb906bd1a9':
Update platform-tools sdk comp to 15.
2012-09-24 14:59:25 -07:00
Xavier Ducrohet
fa82c449ae
am 45825eae: Update platform-tools sdk comp to 15.
...
* commit '45825eae6b2f0436a52699db95644c6477cb6ce9':
Update platform-tools sdk comp to 15.
2012-09-24 14:57:36 -07:00
Xavier Ducrohet
45825eae6b
Update platform-tools sdk comp to 15.
...
Change-Id: Icdcf530ea223c1181b9be9bc1029f126c5558f1d
2012-09-24 14:54:59 -07:00
Daniel Sandler
35d22bff7a
Merge "Add screensavers to default Eclipse classpath." into jb-mr1-dev
2012-09-24 13:42:41 -07:00
Andrew Hsieh
cbe1615693
am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT"
...
* commit '0f0de77b131455192e51a0723fb7a79876a4ca17':
Update README.CRT.TXT
2012-09-24 10:16:42 -07:00
Andrew Hsieh
0f0de77b13
am b034233a: am 3c901267: Merge "Update README.CRT.TXT"
...
* commit 'b034233afae873b98b1b70841439b09fe5d58773':
Update README.CRT.TXT
2012-09-24 09:29:54 -07:00
Andrew Hsieh
b034233afa
am 3c901267: Merge "Update README.CRT.TXT"
...
* commit '3c901267609c17645999aa7a8ca95413ad528038':
Update README.CRT.TXT
2012-09-24 09:28:50 -07:00
Andrew Hsieh
3c90126760
Merge "Update README.CRT.TXT"
2012-09-24 09:24:05 -07:00
Daniel Sandler
91fd25b045
Add screensavers to default Eclipse classpath.
...
Change-Id: I691634e0f2dd6e3436087302caa09c9fb1eb92c2
2012-09-22 20:29:34 -04:00
The Android Automerger
ee35616185
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:28 -07:00
Andrew Hsieh
a0de803db8
Update README.CRT.TXT
...
Change-Id: I7d0ec48c09c47081c01c9366faf993317990b237
2012-09-21 18:50:16 -07:00
Yu Shan Emily Lau
1e1926db07
Merge "For the recent SD card access change. The non-zogyte process need to use the Environment#getLegacyExternalStorage to access the sdcard." into jb-mr1-dev
2012-09-21 16:24:28 -07:00
Yu Shan Emily Lau
b894c71af8
For the recent SD card access change.
...
The non-zogyte process need to use the
Environment#getLegacyExternalStorage to access the sdcard.
Change-Id: I797d235954defe25e1bd8728f167250e4f9d0fe9
2012-09-21 16:20:12 -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
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
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
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