Commit Graph

12030 Commits

Author SHA1 Message Date
Adam Powell
56a17690b0 Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can't reliably handle translation and scaling at the same time." into eclair 2010-01-13 18:00:35 -08:00
John Wang
b61c1a0f8b Add Event log for RAT switch.
Write event log while the 2G/3G radio access technology switched.
2010-01-13 17:55:57 -08:00
Xavier Ducrohet
cff6c8459c am ae4bd059: ADT/Layoutlib: Reimplement parts of BitmapFactory
Merge commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e' into eclair-plus-aosp

* commit 'ae4bd059caa71aa4652c0f07fde7c2687169906e':
  ADT/Layoutlib: Reimplement parts of BitmapFactory
2010-01-13 17:09:52 -08:00
Robert Greenwalt
90528645ad am 1193ae4e: Backport l53e91db7 from master.
Merge commit '1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp

* commit '1193ae4e824c66b75083c444ce0f250594e138ee':
  Backport l53e91db7 from master.
2010-01-13 17:09:40 -08:00
Adam Powell
ae542ff055 TransformGestureDetector is now ScaleGestureDetector - scope reduced.
N1 screen can't reliably handle translation and scaling at the same time.
2010-01-13 17:08:31 -08:00
Ying Wang
46f4b9827e Add instrumentation as a source tag for proguard keep options. 2010-01-13 16:53:07 -08:00
Xavier Ducrohet
ae4bd059ca ADT/Layoutlib: Reimplement parts of BitmapFactory
The original bitmap factory is mostly done in native and deals
with the normal android Bitmap class which has been replaced
in the layoutlib by a bitmap that is merely a wrapper around
an AWT BufferedImage.

This new BitmapFactory creates the layoutlib version of
Bitmap all in Java.

Change-Id: Ice8b5d19141a9a43f83349c159201bf85604b3b0
2010-01-13 16:43:07 -08:00
Robert Greenwalt
1193ae4e82 Backport l53e91db7 from master.
Prevents sending out ConnectivityManager broadcasts when the connection
is repeating the same major state.  This means continued wifi scanning
does not generate CM broadcasts (though wifi state broadcasts continue).

bug: 2265222
Dr No approval: jsh
2010-01-13 09:36:31 -08:00
Ying Wang
b4f4111904 am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp

* commit 'a1d08886ec8549878ad16c19754a3239706fb61b':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
2010-01-12 16:34:13 -08:00
Ying Wang
a1d08886ec Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair 2010-01-12 16:31:14 -08:00
Ying Wang
4199528aab Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
Before this change, aapt generates proguard keep flags like
"-keep class com.android.somepackage.", which proguard doesn't recognize.
2010-01-12 16:08:23 -08:00
Adam Powell
202a6734fd am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:15:43 -08:00
Adam Powell
8acdb201bd Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
2010-01-12 15:08:23 -08:00
Grace Kloba
ba5220fc0c am ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
2010-01-12 10:02:48 -08:00
San Mehat
d26707da89 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
2010-01-12 10:02:40 -08:00
Grace Kloba
ce63c639e9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
c93c70c4b8 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Grace Kloba
e67d5cee67 DO NOT MERGE.
Couple of tweak for multi-touch in WebView.

1. If we can't zoom, don't get in multitouch mode.
   This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
   zoom is called before.
4. Change the width for nativeSetSize, which was modified
   in the last check-in. The new logic should make both
   msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
   out the jitter just before lifting the finger.

Fix http://b/issue?id=2360032
2010-01-12 09:58:43 -08:00
San Mehat
7ebf017658 framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
2010-01-12 07:57:42 -08:00
Xavier Ducrohet
f5a84f8a7f am dfe25b0e: Merge "LayoutLib: support for custom styles." into eclair
Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp

* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
  LayoutLib: support for custom styles.
2010-01-11 15:28:07 -08:00
Xavier Ducrohet
dfe25b0e0c Merge "LayoutLib: support for custom styles." into eclair 2010-01-11 15:25:16 -08:00
Xavier Ducrohet
9ce3b775f5 LayoutLib: support for custom styles.
Change-Id: Ic6c2ef234589f45db15024261d698066aa6e2f4e
2010-01-11 14:28:03 -08:00
Jaikumar Ganesh
495d820c01 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
2010-01-11 14:20:53 -08:00
Jaikumar Ganesh
ccaebfc942 Don't set priority in Bonding state.
This was causing A2DP get connected for Car Docks, when user didn't select it.

Bug: 2364328
Dr No: Eastham
2010-01-11 14:16:29 -08:00
Tom Taylor
2bb1f87089 am 1edd8277: Merge "Hide unused fields" into eclair
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
2010-01-11 14:15:51 -08:00
Tom Taylor
1edd827744 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Trevor Johns
18dedf2cdf am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
2010-01-11 14:05:55 -08:00
Trevor Johns
50a3977c61 Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 2010-01-11 14:00:54 -08:00
Trevor Johns
2187e240c0 Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com. 2010-01-11 11:56:27 -08:00
Dirk Dougherty
6b113b1a82 am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
2010-01-11 11:38:04 -08:00
Dirk Dougherty
595f48b2a4 Merge "SDK doc change: Miscellaneous fixes." into eclair 2010-01-11 11:33:57 -08:00
Dirk Dougherty
cf6bbab6db SDK doc change: Miscellaneous fixes.
Bug: 2160782
Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
2010-01-11 11:15:22 -08:00
Grace Kloba
6c87c77de4 am a2b0d38f: First draft of multitouch in the WebView.
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp

* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
  First draft of multitouch in the WebView.
2010-01-11 10:47:21 -08:00
Grace Kloba
a2b0d38f8c First draft of multitouch in the WebView.
Currently we just handle a simple pinch action. We
will wait for framework support for more complicated
gesture.

When pinch in the webview, zoom level will be changed
on the fly. But we won't re-wrap the text until user
action like double tap, rotate screen.

Double tap will re-layout the page and wrap the text
to the screen width. We try to keep the spot you
tapped at the same place on the screen after relayout.
If the block after relayout fully fit on the current
screen, we will center it for easy reading.

Fix http://b/issue?id=2360032
2010-01-11 10:41:40 -08:00
Dirk Dougherty
1dced50963 SDK doc change: Add doc update for NDKr3.
Bug: 2160782
Change-Id: I20bd2b84bdab27b03c3544d8eecab2404eeb2c1c
2010-01-11 09:33:00 -08:00
Jack Palevich
90ce68a99f am 6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp

* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
  DO NOT MERGE A library for encoding and decoding ETC1 textures.
2010-01-09 21:54:28 -08:00
Jack Palevich
6d0f6c7803 Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair 2010-01-09 21:51:05 -08:00
Vasu Nori
9c74295fb1 am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp

* commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
  add eventlog message whenever sqlite reports db corruption error
2010-01-08 16:33:50 -08:00
Scott Main
c9a26f291b am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp

* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
  javadoc change: fix the selector sample XML in the class
2010-01-08 16:33:45 -08:00
Vasu Nori
a1759ceac2 Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 2010-01-08 15:09:12 -08:00
Scott Main
aa3b5961c0 javadoc change: fix the selector sample XML in the class
description (was broken due to improper ordering)
2010-01-08 12:35:11 -08:00
Daniel Sandler
cffea95e1e am 3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
Merge commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd' into eclair-plus-aosp

* commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd':
  Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
2010-01-08 12:33:17 -08:00
Daniel Sandler
3fb4ee4e03 Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair 2010-01-08 12:31:03 -08:00
Eric Laurent
d31d7397ba am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Vasu Nori
dd1b39be1e add eventlog message whenever sqlite reports db corruption error 2010-01-08 10:11:24 -08:00
Eric Laurent
663ec30880 Fix issue 2361949: A2DP suspend parameters set wrongly.
Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to
BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService.
Previous implementation could cause a false reset of suspend state if a new sink attempted to
connect while A2DP was suspended.
New implementation only resets A2DP suspend state when a new sink is actually connected.
2010-01-08 08:48:18 -08:00
Jack Palevich
994cd7959d DO NOT MERGE A library for encoding and decoding ETC1 textures.
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.

This change adds a host-only version of the library. It is used by
the etc1tool.
2010-01-08 16:00:21 +08:00
Trevor Johns
f6de904a3c am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp

* commit '063d03ed0882582840c7db610635aa89c1a01eec':
  Converting tabs to spaces in docs/html/resources/resources_toc.cs.
2010-01-07 18:58:35 -08:00
Trevor Johns
063d03ed08 Converting tabs to spaces in docs/html/resources/resources_toc.cs. 2010-01-07 15:44:33 -08:00
Dirk Dougherty
5f6002ec5f am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp

* commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
  SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
2010-01-07 12:33:48 -08:00