Xavier Ducrohet
c1b26007a4
am c3a76886: am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge.
...
* commit 'c3a7688651789c53bc468dade39604a386ac364f':
Fix WXGA720 skin to be portrait by default. do not merge.
2011-12-15 14:42:35 -08:00
Xavier Ducrohet
c3a7688651
am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge.
...
* commit '2d95462334a254a6d1aedbc431e19fdb2bb2a0e6':
Fix WXGA720 skin to be portrait by default. do not merge.
2011-12-15 14:41:12 -08:00
Xavier Ducrohet
2d95462334
Fix WXGA720 skin to be portrait by default. do not merge.
...
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.
(cherry picked from commit 144589bfd0 )
Change-Id: I67398ff618ac76da4ec02d1d2e518a8f7618b0fa
2011-12-15 14:38:56 -08:00
Xavier Ducrohet
1ee0d798d6
am 47dea794: am 31ecada2: Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1
...
* commit '47dea79401dffbb0f030df6e9d94e428348b700a':
Fix WXGA720 skin to be portrait by default.
2011-12-15 14:35:27 -08:00
Xavier Ducrohet
47dea79401
am 31ecada2: Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1
...
* commit '31ecada2eed999c9d725cf9af8e634496e462b59':
Fix WXGA720 skin to be portrait by default.
2011-12-15 14:33:27 -08:00
Xavier Ducrohet
31ecada2ee
Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1
2011-12-15 14:31:16 -08:00
Xavier Ducrohet
144589bfd0
Fix WXGA720 skin to be portrait by default.
...
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.
Change-Id: Ic28e3739c30825fe55f8cc6cede5c9a5462f6931
2011-12-15 14:28:46 -08:00
Scott Main
fbd55a9848
am 22260459: am cbfbaee2: am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0
...
* commit '222604594cc398c3f754704bad445ac8285ad9e1':
Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
2011-12-15 10:19:18 -08:00
Scott Main
1d0a6e45c1
am 3fab73d5: am 335151a3: am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0
...
* commit '3fab73d56bbc614de9052a5e8b9218295e7c708a':
Sample app for Android U lesson: Building apps for enterprise - Device administration.
2011-12-15 10:19:17 -08:00
Scott Main
222604594c
am cbfbaee2: am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0
...
* commit 'cbfbaee25e7de47038a08a83d11bcc3a4f2d84eb':
Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
2011-12-15 10:17:27 -08:00
Scott Main
3fab73d56b
am 335151a3: am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0
...
* commit '335151a356db9b3b5204cb648f80239d29f4a38f':
Sample app for Android U lesson: Building apps for enterprise - Device administration.
2011-12-15 10:17:24 -08:00
Scott Main
cbfbaee25e
am e9747521: Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0
...
* commit 'e97475210ab07f0e49b14d267027ab03a68d1099':
Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
2011-12-15 10:15:11 -08:00
Scott Main
335151a356
am d46d8577: Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0
...
* commit 'd46d8577a8cf5ed96c01a70442380910016cdbe2':
Sample app for Android U lesson: Building apps for enterprise - Device administration.
2011-12-15 10:15:09 -08:00
Scott Main
e97475210a
Merge "Sample code for Android U lesson: Monetization - Ads without Compromising User Experience." into ics-mr0
2011-12-15 10:12:19 -08:00
Scott Main
d46d8577a8
Merge "Sample app for Android U lesson: Building apps for enterprise - Device administration." into ics-mr0
2011-12-15 10:11:55 -08:00
Fred Chung
b9c12ba27b
Sample app for Android U lesson: Building apps for enterprise - Device administration.
...
Change-Id: Ie4fbc26be45c32d19a94faed68d9f4070a96c1d7
2011-12-14 20:08:51 -08:00
Adam Powell
1bc7aaff48
Add code sample for ShareCompat
...
Add SharingSupport activity - use ShareCompat.IntentBuilder to produce
sharing intents for menu item sharing, text only, single stream, and
multiple stream.
Add SharingReceiverSupport - receive text/plain content as text only,
single stream, and multiple stream.
Add SharingSupportProvider - simple filesystem-based read-only
ContentProvider for providing a data stream.
Change-Id: I7e69a80984c0c5a8d93663f928f644d55c92350d
2011-12-14 12:14:40 -08:00
The Android Open Source Project
ee4934f63d
am 2e40a882: Reconcile with ics-mr1-release
...
* commit '2e40a8828af426362b693b59ec3cf5863fb6b419':
2011-12-13 19:13:14 -08:00
The Android Open Source Project
2e40a8828a
Reconcile with ics-mr1-release
...
Change-Id: I265bf3e85c8ba4dc481825ff3d09c8e68436f4b7
2011-12-13 19:10:06 -08:00
The Android Automerger
c30c3a4192
merge in ics-mr1-release history after reset to ics-mr1
2011-12-13 16:02:26 -08:00
Fred Chung
df52a4cafe
Sample code for Android U lesson: Monetization - Ads without Compromising User Experience.
...
Change-Id: I6b077c24f71c00e99fe6e15da127b02707ad57f3
2011-12-13 15:39:35 -08:00
Scott Main
b6062546c4
am f9a0d6e9: am a5601068: am 514d1cdb: Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml.
...
* commit 'f9a0d6e9d727f0a8fe806f0089a28c8c6b0cdd83':
revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML page
2011-12-13 13:15:23 -08:00
Scott Main
f9a0d6e9d7
am a5601068: am 514d1cdb: Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support l
...
* commit 'a56010682aa45e86ce9e675a88415071397e18e9':
revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML page
2011-12-13 13:13:05 -08:00
Scott Main
a56010682a
am 514d1cdb: Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML p
...
* commit '514d1cdb04594d418828f0c6ec642cb180608198':
revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML page
2011-12-13 13:10:41 -08:00
Raphael
0c70c88b4e
am 96876032: (-s ours) am 476edbaa: Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
...
* commit '96876032c729ee7e24cfdc80c0dc9259045b572e':
Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
2011-12-13 11:33:53 -08:00
Raphael
96876032c7
am 476edbaa: Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
...
* commit '476edbaae4f458ec8283955872481bd2565ed5b3':
Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
2011-12-13 11:31:34 -08:00
Scott Main
514d1cdb04
Merge "revisions to NewsReader sample app for AndroidU. Clean up XML markup for clean rendering in HTML docs; Change string resources for two-pane mode to bools; Rename resource files w/ layout info from main.xml to layouts.xml. Add support lib Add HTML page" into ics-mr0
2011-12-13 10:25:23 -08:00
Vladimir Chtchetkine
1855f8eba8
Merge "Pass white balance and exposure compensation to webcam emulator"
2011-12-13 07:34:38 -08:00
The Android Open Source Project
1275c55fd6
am afe287f9: Reconcile with ics-mr1-release
...
* commit 'afe287f9ce042241da7a8b88b5e4134555fcbc10':
2011-12-13 05:40:52 -08:00
The Android Open Source Project
afe287f9ce
Reconcile with ics-mr1-release
...
Change-Id: I54bb077fa4b6424bd1c6da1e5b326194a78c6c05
2011-12-13 05:11:38 -08:00
Raphael
476edbaae4
Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.
...
SDK Bug: 21115
(cherry picked from commit 94a55ddf0b )
Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc
2011-12-12 22:08:12 -08:00
The Android Automerger
16ac19efd5
merge in ics-mr1-release history after reset to ics-mr1
2011-12-12 22:08:10 -08:00
Xavier Ducrohet
cc0035973e
am 53973805: am 56259594: Merge "Move support lib to rev 6." into ics-mr1
...
* commit '5397380528fdbb80e32094d1313d8ee308f8528c':
Move support lib to rev 6.
2011-12-12 18:01:24 -08:00
Dianne Hackborn
1bf05273dc
am 100dc50d: am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1
...
* commit '100dc50d0b40330cb0e189653d1965ab1c20095b':
SDK only: add markup for use in documentation.
2011-12-12 17:49:32 -08:00
Jesse Hall
fcc135f554
am 705c46ec: am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting
...
* commit '705c46ec3f5588e16511ae0e4239d310c85fecf8':
EmuGL: remove broken EGL buffer refcounting
2011-12-12 17:49:18 -08:00
Xavier Ducrohet
5397380528
am 56259594: Merge "Move support lib to rev 6." into ics-mr1
...
* commit '56259594da620757e95172ef6ff68cade501da51':
Move support lib to rev 6.
2011-12-12 17:02:16 -08:00
Xavier Ducrohet
56259594da
Merge "Move support lib to rev 6." into ics-mr1
2011-12-12 17:00:44 -08:00
Xavier Ducrohet
4a6b52bc98
Move support lib to rev 6.
...
Change-Id: Iad48f3d8b7d8399df4286f2a8995a079797d25ea
2011-12-12 17:00:09 -08:00
Scott Main
442088151c
revisions to NewsReader sample app for AndroidU.
...
Clean up XML markup for clean rendering in HTML docs;
Change string resources for two-pane mode to bools;
Rename resource files w/ layout info from main.xml to layouts.xml.
Add support lib
Add HTML page
Change-Id: I88fc5cedb8f11dae9de019ba75593de2027de231
2011-12-12 16:28:27 -08:00
Dianne Hackborn
100dc50d0b
am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1
...
* commit '170b26ba32bd86df929a8a27fefde91a114f3831':
SDK only: add markup for use in documentation.
2011-12-12 16:10:57 -08:00
Dianne Hackborn
170b26ba32
Merge "SDK only: add markup for use in documentation." into ics-mr1
2011-12-12 16:09:23 -08:00
The Android Open Source Project
04206b6bf1
am caf0e6aa: Reconcile with ics-mr1-release
...
* commit 'caf0e6aab57fe5e25fabc2aa485f44770678c816':
2011-12-12 15:39:12 -08:00
Xavier Ducrohet
82812f2c1f
am e66ffc14: am fed7d838: Move samples to API 15.
...
* commit 'e66ffc1440e003eddb8b39cc335b41f345dc68c9':
Move samples to API 15.
2011-12-12 15:39:06 -08:00
Xavier Ducrohet
3161c0b517
am 60fe4a56: am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1
...
* commit '60fe4a56ddbb4b8bb8c5b058cdf854729a895cef':
Increase skin ram and vmheap.
2011-12-12 15:30:34 -08:00
James Dong
8ec23d4aeb
am 23bb55d6: am 4fed461d: Revert "Revert "Update the media_profiles.xml file to include..."
...
* commit '23bb55d60692accef0459e3683867b6b352cd9da':
Revert "Revert "Update the media_profiles.xml file to include..."
2011-12-12 15:30:30 -08:00
Jean-Baptiste Queru
a6dd287af9
am e1f412ff: am a98b9f28: Revert "Revert "Update the media_profiles.xml file to include...""
...
* commit 'e1f412ffa4fdd33462fb19c38564a20b354677e4':
Revert "Revert "Update the media_profiles.xml file to include...""
2011-12-12 15:30:22 -08:00
Bruno Oliveira
bbafd9c0b6
am efe10dd5: am 7e3475ca: am 4ea24bff: cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
...
* commit 'efe10dd581677c2bd8e43df07e14bdd3f3a19139':
cherrypick from master cl Change-Id: I45f91fd9cfe0cb89789017deec63565e4757063e Adding the NewsReader sample.
2011-12-12 15:30:19 -08:00
The Android Open Source Project
2274559ded
am 37cb2f70: Reconcile with ics-mr1-release
...
* commit '37cb2f70392b95a3aa4f379b2e1f6baf1500af7b':
2011-12-12 15:29:49 -08:00
Jesse Hall
705c46ec3f
am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting
...
* commit '5d721ef6a14dc22c6b44042f83f3a48ad68d05d4':
EmuGL: remove broken EGL buffer refcounting
2011-12-12 15:26:17 -08:00
Jesse Hall
5d721ef6a1
am b0a30e43: EmuGL: remove broken EGL buffer refcounting
...
* commit 'b0a30e43889415a9a40b9519392ad3be295b9465':
EmuGL: remove broken EGL buffer refcounting
2011-12-12 15:23:59 -08:00