Robert Greenwalt
27d3c5907c
Switch from NetworkUtils to netd for iface config.
...
Moving more stuff to netd and getting rid of unused NetworkUtils.
Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
2011-01-21 10:44:12 -08:00
Gloria Wang
797297456e
Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/"
2011-01-18 16:09:44 -08:00
Gloria Wang
7a5321d4d8
rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
...
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
2011-01-18 15:23:51 -08:00
James Dong
a83be75b8b
Merge "Fix the build break in git_master-without-vendor"
2011-01-18 13:40:06 -08:00
Dharmaray Kundargi
328af07ab9
Fix the build break in git_master-without-vendor
...
Change-Id: I0fc091756c84d79755ca4cc0a0023ad71057ea1e
2011-01-18 13:36:07 -08:00
Romain Guy
ba7ac24e4d
am a2dcab45: am 89108d5c: Merge "Add support for skew()" into honeycomb
...
* commit 'a2dcab45d8dbbd9fd8d93720a91f789f18ae4d76':
Add support for skew()
2011-01-18 12:23:54 -08:00
Dianne Hackborn
2e1469a13d
am f6759102: am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
...
* commit 'f67591025debf040695e9ed0d0edeff5ef0c5db2':
Fix issue #3362666 Activities launched from ongoing notifications don't animate
2011-01-18 12:10:36 -08:00
Mike Lockwood
a999802d0c
am f9828f65: am 0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
...
* commit 'f9828f6584ddbab9aab3abdbc47ef355651e7bfb':
MTP: Fix problems with modification dates for folders and non-media files
2011-01-18 12:10:31 -08:00
John Reck
14ae0cb842
am 3977afe4: am d00207ff: Merge "WebStorage public API change" into honeycomb
...
* commit '3977afe41679290fedbe661e53dcf360136f52d0':
WebStorage public API change
2011-01-18 12:10:22 -08:00
David Turner
760e91cd85
am adec2de2: am 6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
...
* commit 'adec2de2e35f3dab186d1abbbeb7497921a35c2c':
Prevent Dropbox from crashing system server pre-boot.
2011-01-18 12:10:17 -08:00
Dmitri Plotnikov
016c6daff0
am b92d08a7: am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb
...
* commit 'b92d08a7385f241722b2299a988ab7a55053f6ea':
Hiding the AsyncTaskLoader.waitForLoader method
2011-01-18 12:10:07 -08:00
Derek Sollenberger
3f47ce8e0f
am 51b8a92e: am 788c5185: Merge "Fix smart zoom for plugins that use OpenGL." into honeycomb
...
* commit '51b8a92e23ff47e73faf67ea78ce1bd29b9a6d59':
Fix smart zoom for plugins that use OpenGL.
2011-01-18 12:10:00 -08:00
Romain Guy
a2dcab45d8
am 89108d5c: Merge "Add support for skew()" into honeycomb
...
* commit '89108d5c311d0cc6879fb41c6392f17c58644fee':
Add support for skew()
2011-01-18 11:23:07 -08:00
Dianne Hackborn
f67591025d
am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
...
* commit '3aa959b9ce7ac4ac241033b3eea9f2c0ce34d554':
Fix issue #3362666 Activities launched from ongoing notifications don't animate
2011-01-18 11:20:29 -08:00
Mike Lockwood
f9828f6584
am 0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
...
* commit '0de274b34c554a0e87b1071e001e41e416cd7678':
MTP: Fix problems with modification dates for folders and non-media files
2011-01-18 11:20:22 -08:00
John Reck
3977afe416
am d00207ff: Merge "WebStorage public API change" into honeycomb
...
* commit 'd00207ff87fa3e2d5430ea5c0980041c44738efe':
WebStorage public API change
2011-01-18 11:18:59 -08:00
David Turner
adec2de2e3
am 6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
...
* commit '6195eb134be28a62b2bd70b07b94f16311ef6169':
Prevent Dropbox from crashing system server pre-boot.
2011-01-18 11:18:54 -08:00
Dmitri Plotnikov
b92d08a738
am 48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb
...
* commit '48395385039a0c845bba8913c8d0c76981425aa4':
Hiding the AsyncTaskLoader.waitForLoader method
2011-01-18 11:18:37 -08:00
Derek Sollenberger
51b8a92e23
am 788c5185: Merge "Fix smart zoom for plugins that use OpenGL." into honeycomb
...
* commit '788c51852a559f17188f60c40f0c0d83abbafab2':
Fix smart zoom for plugins that use OpenGL.
2011-01-18 11:18:32 -08:00
Romain Guy
89108d5c31
Merge "Add support for skew()" into honeycomb
2011-01-18 11:17:20 -08:00
Romain Guy
807daf7df6
Add support for skew()
...
Change-Id: Ia3a9a867f74fd78b61f75179e3788fdc2f0cacd0
2011-01-18 11:19:19 -08:00
Dianne Hackborn
3aa959b9ce
Merge "Fix issue #3362666 Activities launched from ongoing notifications don't animate" into honeycomb
2011-01-18 11:14:46 -08:00
Mike Lockwood
0de274b34c
Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
2011-01-18 11:13:01 -08:00
John Reck
d00207ff87
Merge "WebStorage public API change" into honeycomb
2011-01-18 11:10:26 -08:00
David Turner
6195eb134b
Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
2011-01-18 11:09:03 -08:00
Dianne Hackborn
08121bca5b
Fix issue #3362666 Activities launched from ongoing notifications don't animate
...
The phone-oriented code for turning off animations when the screen is entirely
covered by the status bar was not appropriate for the tablet.
Change-Id: Ica3e0db989f16b9187eacd6ecf4ac3d17661dd6d
2011-01-18 11:08:40 -08:00
Mike Lockwood
7a0bd17bce
MTP: Fix problems with modification dates for folders and non-media files
...
Also removed an unnecessary parameter to MtpDatabase.endSendobject()
BUG: 3352142
Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 11:07:11 -08:00
Dmitri Plotnikov
4839538503
Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb
2011-01-18 11:01:35 -08:00
Brad Fitzpatrick
34165c6967
Prevent Dropbox from crashing system server pre-boot.
...
Bug: 3362748
Change-Id: I3f94f22798eb4a6ef14dd9a418fd3c054637e16b
2011-01-18 10:52:42 -08:00
Derek Sollenberger
788c51852a
Merge "Fix smart zoom for plugins that use OpenGL." into honeycomb
2011-01-18 10:38:34 -08:00
Dirk Dougherty
466e2e2bcb
am 17b1d268: am 8d74f7f5: Merge "Doc change: fix busted link to DatePicker tutorial." into honeycomb
...
* commit '17b1d268e7224ff3dcf4f878d1811c5d1c37aa1c':
Doc change: fix busted link to DatePicker tutorial.
2011-01-18 10:20:44 -08:00
Dirk Dougherty
17b1d268e7
am 8d74f7f5: Merge "Doc change: fix busted link to DatePicker tutorial." into honeycomb
...
* commit '8d74f7f560498966d06a1fb5f490d182ade6c3c2':
Doc change: fix busted link to DatePicker tutorial.
2011-01-18 10:18:23 -08:00
Ben Murdoch
71b1b69232
am 5ad8c70d: am e609241a: Merge "Disable AutoFill in private browsing mode." into honeycomb
...
* commit '5ad8c70d69a56d874adaf9ec0f59e142c70d2aff':
Disable AutoFill in private browsing mode.
2011-01-18 10:17:32 -08:00
Dirk Dougherty
8d74f7f560
Merge "Doc change: fix busted link to DatePicker tutorial." into honeycomb
2011-01-18 10:16:31 -08:00
Ben Murdoch
5ad8c70d69
am e609241a: Merge "Disable AutoFill in private browsing mode." into honeycomb
...
* commit 'e609241a76005cf09ed62b2cf99bf1a7a523bb99':
Disable AutoFill in private browsing mode.
2011-01-18 10:14:10 -08:00
Ben Murdoch
e609241a76
Merge "Disable AutoFill in private browsing mode." into honeycomb
2011-01-18 10:07:01 -08:00
Derek Sollenberger
dd1173bc9b
Fix smart zoom for plugins that use OpenGL.
...
bug: 3331323
Change-Id: I4f1d4e0ecdb75283fc781bf5afe579f43610506c
2011-01-18 13:02:07 -05:00
Ben Murdoch
4bd87d6e47
Disable AutoFill in private browsing mode.
...
Ensure that WebKit knows that AutoFill is disabled when private
browsing is on.
Bug: 3335257
Change-Id: I8c3e45175211e5cb00605c1dbf974e513c582d8e
2011-01-18 17:54:05 +00:00
Dmitri Plotnikov
4afde4fda3
Hiding the AsyncTaskLoader.waitForLoader method
...
I introduced this method a couple of weeks ago,
but then we had a chat with Dianne and she made
a good point that rather than having this behavior
on AsyncTaskLoader, we should have it on LoaderManager
and then it will cover all kinds of loaders,
not just the ones inheriting from AsyncTaskLoader.
She suggested that we postpone that work until
after Honeycomb.
Change-Id: I1939956296cddb678791ba652ab5f4a0dd45eea1
2011-01-18 09:41:29 -08:00
Justin Ho
cb2b08eaf8
am dec38672: am 08dc7ce5: New lockscreen assets for xlarge
...
* commit 'dec3867252ac62ee8e0e2b63a4f809ecf8449573':
New lockscreen assets for xlarge
2011-01-18 09:19:00 -08:00
Justin Ho
dec3867252
am 08dc7ce5: New lockscreen assets for xlarge
...
* commit '08dc7ce56f3fe08912e9b9be9d9bcf17b546ebf8':
New lockscreen assets for xlarge
2011-01-18 09:17:38 -08:00
Justin Ho
08dc7ce56f
New lockscreen assets for xlarge
...
Change-Id: Iaf116307ec645630761d4f00810fa01022eeef4e
2011-01-18 09:12:51 -08:00
Justin Ho
af8641aa2d
am a8835a3a: am 8c01a16c: Battery charging assets (HDPI) from Gingerbread
...
* commit 'a8835a3a2cfcbc025563230f3d78c7051d6b1e9e':
Battery charging assets (HDPI) from Gingerbread
2011-01-18 08:50:57 -08:00
Gilles Debunne
32ad6bc8d5
am 4abb69c3: am aba62a59: Merge "Added a touch up filter in text selection handles." into honeycomb
...
* commit '4abb69c3370b6ea52d9685d1df9e81b6bf0e4f4a':
Added a touch up filter in text selection handles.
2011-01-18 08:50:54 -08:00
Cary Clark
0a191ae328
am cba57548: am b2601359: add interface to return if (x/y) is a plugin
...
* commit 'cba5754838fdd67fa333ec12f6626c8d9e07076f':
add interface to return if (x/y) is a plugin
2011-01-18 08:50:44 -08:00
Kristian Monsen
7cef38bca1
am b3e976fd: am 0664c62c: Merge "Motorola request to fix proxy" into honeycomb
...
* commit 'b3e976fdd9f8b2273651f02ca84d403e448cfba7':
Motorola request to fix proxy
2011-01-18 08:49:21 -08:00
Owen Lin
5cfc8afd0a
am 90f7fd92: am 4b26247e: Merge "Change to stream decoding mode if the file descriptor cannot support seek." into honeycomb
...
* commit '90f7fd92eb5fea05d6aac105742534c638746b9c':
Change to stream decoding mode if the file descriptor cannot support seek.
2011-01-18 08:49:17 -08:00
Hung-ying Tyan
683cfdfd04
am a63ec1f2: am f46013b6: Merge "Merge "SipService: registers broadcast receivers on demand."" into honeycomb
...
* commit 'a63ec1f28a61b86b34e570ce7de42845c44e2bc1':
Merge "SipService: registers broadcast receivers on demand."
2011-01-18 08:49:13 -08:00
Hung-ying Tyan
dbbdabd79a
am 323855f4: am 40f2cacb: Merge "SipService: release wake lock for cancelled tasks."
...
* commit '323855f49559d66d6f84e8fcb7e8ba6b62683be3':
Merge "SipService: release wake lock for cancelled tasks."
2011-01-18 08:49:09 -08:00
Xavier Ducrohet
6db284b101
am 739137e7: am 9d0577ec: LayoutLib: properly configure ApplicationInfo with targetSdkVersion.
...
* commit '739137e7af3550ad15540bb4f4401fbab5a49ab9':
LayoutLib: properly configure ApplicationInfo with targetSdkVersion.
2011-01-18 08:49:04 -08:00