LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,562 Commits 2 Branches 0 Tags
726a7eb6cf28f2cb34f9c8ee20b66e7b8962e20c
Commit Graph

8562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
93d610d59a DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
Change-Id: I6d13b21bdafa70ea19d14a95b65476ba7c037d8c
 2011-12-20 11:12:35 -08:00
Roman Nurik
a64f05b65b Allow d.a.c. to serve SVG files 
Change-Id: Ia652bd2f0a6a0dcfd17915dde5269bd8d37bceef
 2011-12-20 10:54:44 -08:00
The Android Automerger
c5c9827f6c merge in ics-release history after reset to master 2011-12-19 06:59:28 -08:00
The Android Automerger
26a63bc183 merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:28 -08:00
Xavier Ducrohet
1c59fc4f56 am 5192264c: (-s ours) am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours 
* commit '5192264cf4b2742443bd66d4d320a63f7a39f3bc':
  Move platform component to rev3. do not merge.
 2011-12-15 15:58:43 -08:00
Xavier Ducrohet
5192264cf4 am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours 
* commit 'dc6a269f821073fc4bb4cf0f463e09ef15619fd3':
  Move platform component to rev3. do not merge.
 2011-12-15 15:55:50 -08:00
Xavier Ducrohet
dc6a269f82 Merge commit '71c1d3d8' into MR1 using -s ours 
Change-Id: I392ab7665f40f9c273f8d0f837597f1bd6c9d135
 2011-12-15 15:52:09 -08:00
Xavier Ducrohet
71c1d3d864 Move platform component to rev3. do not merge. 
Change-Id: I21157462faf12322112244d13390592e24529748
 2011-12-15 14:53:40 -08:00
Xavier Ducrohet
2cbdc6a768 am c1b26007: (-s ours) am c3a76886: am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge. 
* commit 'c1b26007a49cc6bf9483800b76f039c778335990':
  Fix WXGA720 skin to be portrait by default. do not merge.
 2011-12-15 14:44:38 -08:00
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 Automerger
4ee2df8c3f merge in ics-release history after reset to master 2011-12-14 06:59:32 -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 Automerger
9510161009 merge in ics-release history after reset to master 2011-12-13 06:59:33 -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