387 Commits

Author SHA1 Message Date
Fred Quintana
d9d2f1140b change the sync framework and users to understand Account 2009-04-23 15:37:45 -07:00
Cary Clark
843bbb8597 reset select/copy state if key is pressed while shift is down
If a webpage suppresses keys from getting echoed back to the
browser app, then also disable select/copy when a key follows
a shift key press.

Also add in missing debug string to permit debug builds.
2009-04-23 10:40:28 -04:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Wu-cheng Li
ab5b424db3 Remove debug messages.
modified:   core/java/android/hardware/Camera.java

	modified:   camera/libcameraservice/CameraService.cpp
2009-04-22 16:22:01 +08:00
Jeff Hamilton
69c1c4983f Merge branch 'readonly-p4-master' 2009-04-21 15:17:40 -07:00
Jeff Hamilton
b0c6dbd53b AI 147255: am: CL 147253 am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
Original author: jham
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147255
2009-04-21 15:16:13 -07:00
Jeff Hamilton
be456ac934 Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:14:41 -07:00
Jeff Hamilton
348c1796d4 AI 147253: am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
Original author: jham
  Merged from: //branches/cupcake/...

Automated import of CL 147253
2009-04-21 15:13:18 -07:00
Andy Stadler
108ba992b2 Merge branch 'readonly-p4-master' 2009-04-21 11:58:49 -07:00
Andy Stadler
a0cce9b120 AI 147170: am: CL 147168 am: CL 147163 Copy documentation for the various search-by-voice flags that
were already listed in attrs.xml into SearchManager.java.  Add
  a (brief - no time for more) description about how to add search
  by voice to apps.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147170
2009-04-21 11:57:29 -07:00
Andy Stadler
407784ccac Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:56:08 -07:00
Andy Stadler
e9948b27a0 Merge branch 'readonly-p4-master' 2009-04-21 11:55:49 -07:00
Andy Stadler
4c156ec6ec AI 147168: am: CL 147163 Copy documentation for the various search-by-voice flags that
were already listed in attrs.xml into SearchManager.java.  Add
  a (brief - no time for more) description about how to add search
  by voice to apps.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...

Automated import of CL 147168
2009-04-21 11:54:45 -07:00
Andy Stadler
72d5de71f2 AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
  package manager package name (not the java package name, and
  not the test package) of the package holding the Activity
  under test.
  Added similar notations to the ApiDemos call sites.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147169
2009-04-21 11:54:14 -07:00
Andy Stadler
080b195a05 Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:53:07 -07:00
Andy Stadler
df2a463b01 AI 147167: am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
  package manager package name (not the java package name, and
  not the test package) of the package holding the Activity
  under test.
  Added similar notations to the ApiDemos call sites.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...

Automated import of CL 147167
2009-04-21 11:51:43 -07:00
Andreas Huber
0de7dcd126 Ensure ongoing progress updates after using the scroll ball to adjust position.
We use a single outstanding message of type SHOW_PROGRESS to refresh the progress
bar's current position as well as textual display of time and duration. This message
could get lost if the scroll ball was used to adjust the current playback position as
we entered state "mDragging" which would cause the subsequent SHOW_PROGRESS message
to be a no-op and would also cause it to not be re-enqueued.
The change refactors the seekbar logic a little and makes sure that while dragging
there isn't a pending SHOW_PROGRESS message in the queue and once dragging is over,
exactly one SHOW_PROGRESS message is reenqueued.

related to bug 1721227
2009-04-20 16:56:04 -07:00
Fred Quintana
3326920329 adding concept of features to accounts 2009-04-20 16:06:02 -07:00
Android (Google) Code Review
24a4320f9c Merge change 261
* changes:
  Enable Application Caches.
2009-04-20 10:04:34 -07:00
Andrei Popescu
60a9a7d055 Enable Application Caches. 2009-04-20 14:23:58 +01:00
Evan Millar
ac9fd3e423 Merge branch 'readonly-p4-master' 2009-04-18 23:36:20 -07:00
Evan Millar
74e258d63e AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
Original author: emillar

Automated import of CL 146854
2009-04-18 23:35:03 -07:00
Brandon Ballinger
cd63c7f89a Merge branch 'readonly-p4-master' 2009-04-18 22:05:19 -07:00
Brandon Ballinger
f1bb004cda AI 146615: am: CL 146613 Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Original author: brandonb

Automated import of CL 146615
2009-04-18 22:04:01 -07:00
Evan Millar
4482d8c8e4 Merge branch 'readonly-p4-donut' into donut 2009-04-18 12:27:51 -07:00
Evan Millar
c64edde69d AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=1755458

Automated import of CL 146853
2009-04-18 12:26:32 -07:00
Android (Google) Code Review
7bec074f25 Merge change 164
* changes:
  Use lower case mime type, encoding, and transfer encoding.
2009-04-17 05:26:25 -07:00
Patrick Scott
2563ed8f70 Use lower case mime type, encoding, and transfer encoding. 2009-04-17 08:23:07 -04:00
Brandon Ballinger
3385e728d8 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Brandon Ballinger
181a44dd81 AI 146613: Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Automated import of CL 146613
2009-04-16 14:31:48 -07:00
Android (Google) Code Review
7a430cf152 Merge change 195
* changes:
  Make webkit's cursor draw at the correct times.
2009-04-16 06:21:10 -07:00
Tammo Spalink
e564b19ed2 replaced integer * and % with shift operations, for performance 2009-04-16 14:48:19 +08:00
Leon Scroggins
63dda1c7b4 Make webkit's cursor draw at the correct times.
This change is dependent on another change to external/webkit.  Tell the WebViewCore to change its FocusController's "active" status depending upon whether the WebView has focus.  This fixes a bug where we were showing the blinking cursor when the WebView was not in focus.
2009-04-15 13:25:00 -04:00
Eric Shienbrood
51b0c74d8d Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Eric Shienbrood
2ecc74f330 AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
2009-04-14 15:40:20 -07:00
Android (Google) Code Review
e2393c5792 Merge changes 108,130,131 into donut
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
2009-04-14 14:40:02 -07:00
Android (Google) Code Review
4602d022ba Merge change 109 into donut
* changes:
  Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Android (Google) Code Review
b0d4a3502e Merge change 133 into donut
* changes:
  Initial code for cdma sms encode and decode, in java, with simple tests.
2009-04-14 13:20:43 -07:00
Mike Lockwood
42ad56ead4 telephony: Add support for bringing up GSM data connections for GPS SUPL.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-14 14:58:29 -04:00
Leon Scroggins
90402eb626 Merge branch 'readonly-p4-master' 2009-04-14 11:07:14 -07:00
Leon Scroggins
17c3bfc8c9 AI 146153: Make the TextDialog invisible, so that we only show WebKit's rendering of the textfield, yet we retain the benefits of having the TextDialog.
Frame.cpp:
  Removed a line that should not be there anyway.  Somehow when merging in Apple's ENABLE(TEXT_CARET) changes we left in a line that disables the blinking Cursor.
  Platform.h:
  Let WebKit draw the cursor.
  RenderThemeAndroid.cpp:
  Make the active selection color (the color of a selection in an active <textfield> or <textarea>) visible, and match the selection color shown in other places in Android.
  WebViewCore.cpp:
  Make the focused node's document's focus controller active.  This allows webkit to draw the cursor.
  TextDialog.java:
  Set WillNotDraw to true, and remove our background, so that the TextDialog is completely invisible.  Note that I have not changed its visibility to View.VISIBLE, which would have other undesired effects (would not accept touch events, for example).  Since we are not drawing, remove onPreDraw, which is no longer necessary.  In onSelectionChanged, pass a message to webkit telling it that the selection has changed.  It is important that the two threads always agree (albeit webkit may be behind) because the user will now only see the selection drawn by webkit.  Remove some old flawed code whose purpose was to keep the selection up to date and do not send key events for arrow keys (which would mess up the selection that was correct thanks to onSelectionChanged).
  BUG=1781070,1712752,916193,1411370,1160999,1775425,1354814

Automated import of CL 146153
2009-04-14 10:57:13 -07:00
Tammo Spalink
83917db040 Initial code for cdma sms encode and decode, in java, with simple tests.
(direct cherry-pick of master 42/42/8)
2009-04-14 10:01:23 +08:00
Eric Shienbrood
308618fa9d Merge branch 'readonly-p4-donut' into donut 2009-04-13 18:14:07 -07:00
Eric Shienbrood
9900127828 AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  Original author: ers
  Merged from: //branches/cupcake/...

Automated import of CL 145980
2009-04-13 18:12:47 -07:00
Dave Bort
34f1ca7b79 util/DebugUtils: Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-13 17:18:45 -07:00
Dave Bort
76c0226008 text: Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.

BUG=1780938
2009-04-13 17:17:21 -07:00
Jeffrey Sharkey
269ba974fb Merge branch 'readonly-p4-master' 2009-04-13 16:58:42 -07:00
Jeffrey Sharkey
3ff7eb92ad AI 146012: am: CL 145860 am: CL 145568 Hide setStarted() from public API.
It should be renamed to something more meaninful before being exposed.
  Original author: jsharkey
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146012
2009-04-13 16:57:28 -07:00
Dianne Hackborn
81ddb7929f Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dianne Hackborn
b3cddae499 AI 146011: am: CL 145859 am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive).
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146011
2009-04-13 16:54:00 -07:00