Commit Graph

4775 Commits

Author SHA1 Message Date
Romain Guy
00b17659bb Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Prevent infinite loop in the Phone UI.
2010-02-17 21:16:36 -08:00
Romain Guy
67e9e9df92 Manual merge of 40170 (b4a107d826) DO NOT MERGE
Fix the lock screen.
2010-02-17 21:12:47 -08:00
Romain Guy
8368ef0b67 Manual merge of 40080 DO NOT MERGE
Properly notifies listener when an animation is cancelled.
Bug: #2428005.
2010-02-17 20:49:10 -08:00
Eric Laurent
c1eba82ba4 Merge "Fix issue: 2413494: Add TTY support." into eclair 2010-02-11 09:23:21 -08:00
Eric Laurent
7749adfd01 Fix issue: 2413494: Add TTY support.
This is a new implementation of TTY support.
Previous implementation in commit aead64def1 is reverted.
The new method does not rely any more on the kernel headset driver to send a UEvent containing
current TTY mode.
2010-02-10 11:23:04 -08:00
Bart Sears
a1ab976671 Merge "DO NOT MERGE" into eclair 2010-02-10 09:35:37 -08:00
Grace Kloba
b3316d35ff DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,29843 from eclair-mr2
This will cherry-pick SHA1: 58def690a8

This will workaround the following three bugs which are occuring because
the webview DB is getting corrupted:

http://b/issue?id=2338178
http://b/issue?id=2278210
http://b/issue?id=2405650

Here are the comments from the eclair-mr2 CL:

If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.

Fix http://b/issue?id=2179339
2010-02-10 09:24:31 -08:00
Grace Kloba
614f8450a7 DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,39258 from master

Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.

Fix http://b/issue?id=2413364
2010-02-09 18:20:28 -08:00
Adam Powell
e88192b9d2 Cleanup fixes for ScaleGestureDetector 2010-02-09 10:27:48 -08:00
Eric Laurent
aead64def1 Fix issue: 2413494: [Passion-c] Add TTY support.
Handle TTY mode change events received by HeadsetObserver and send information down to AudioHardware with AudioManager.setParameters()

Use setting "tty_mode_uses_heaset_events" in core config.xml to indicate if the product uses this particular
method of indicating the TTY mode change.
2010-02-03 23:35:34 -08:00
Jim Miller
d8a3a8957b Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Updated javadoc.
2010-01-29 17:59:33 -08:00
Grace Kloba
769ed21c33 Fix http://b/issue?id=2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
2010-01-27 12:24:38 -08:00
Jim Miller
9985867a8e Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode. 2010-01-26 12:34:25 -08:00
Mike Reed
f904be1659 Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Mike Reed
729d8369b5 disable high-quality filtering during scrolling, until I can cached the scaled images. 2010-01-25 08:30:35 -05:00
Jim Miller
af1b980ef1 Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
2010-01-22 19:09:50 -08:00
Grace Kloba
5ff24d5da4 DO NOT MERGE
This reverts commit 52cb3cbd6f.
2010-01-22 12:45:54 -08:00
Fred Quintana
9a400fa4d3 Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
Eric Fischer
50adb16753 Pull in "emergency calls only" translations. 2010-01-21 13:52:09 -08:00
John Wang
7f70998dec Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Fred Quintana
44037e6c41 initialize sync adapters that get installed while the system is running
bug http://b/issue?id=2360782
2010-01-21 13:14:49 -08:00
John Wang
f936745f5a Add Emergency Calls Only String.
Prepare strings for bug 2352094.

The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
2010-01-21 12:46:01 -08:00
Wei Huang
22149f3d4e fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.

I tested this by calling

  ContactHeaderWidget.bindFromPhoneNumber(number1);
  ContactHeaderWidget.bindFromPhoneNumber(number2);

where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.

- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.

Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
2010-01-21 12:06:43 -08:00
Grace Kloba
f6aed0e0a7 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
d5ada83c71 ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.

This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
2010-01-20 23:06:43 -08:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.

Added over limit zoom feedback for pinch in the WebView.

Fix http://b/issue?id=2383539
2010-01-20 21:58:27 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00
Mike Reed
a66baccc8f Merge "Do not merge" into eclair 2010-01-20 18:32:32 -08:00
Grace Kloba
8f9fbb0c45 Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=2385061
2010-01-20 17:35:50 -08:00
Mike Reed
12bcbdc681 Do not merge
port stretchy from master
2010-01-20 16:27:36 -05:00
Mike Reed
9f954cf27e Merge "Do not merge" into eclair 2010-01-20 13:17:49 -08:00
Adam Powell
380b525220 Edge of screen slop detection for ScaleGestureDetector. 2010-01-19 16:33:46 -08:00
Mike Reed
1e1a7a5017 Do not merge
roll 1-line fix from master here. Fixes crasher when apps use custom fonts

fixes http://code.google.com/p/android/issues/detail?id=6030
2010-01-19 16:40:31 -05:00
Amith Yamasani
b35b8c1334 Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair 2010-01-19 11:50:39 -08:00
Grace Kloba
f167c4bfca DO NOT MERGE
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
2010-01-18 15:30:59 -08:00
Grace Kloba
17b14bd36a DO NOT MERGE
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.

This should fix the weird state Bart got in with
m.wikipedia.org.
2010-01-18 15:29:46 -08:00
Grace Kloba
5a0bf1f03e DO NOT MERGE
Remove testing (enable plugin) code.

No reflow when zoom in, auto reflow when zoom out.

Fix http://b/issue?id=2375955
2010-01-18 15:29:46 -08:00
Grace Kloba
d79d1c7299 Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 2010-01-18 15:21:38 -08:00
Grace Kloba
f080a5adf6 Merge "DO NOT MERGE" into eclair 2010-01-18 15:21:31 -08:00
Grace Kloba
d4d1d6eca0 If ZoomButttonsController detects more than one pointer,
give up the control. This should enable the View behind
it, like WebView, will always get the multi-pointer
events even when ZoomButtonsController is up.
2010-01-18 10:43:59 -08:00
Jim Miller
813d2d8678 Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 2010-01-15 17:20:29 -08:00
Grace Kloba
19c9df3c1d DO NOT MERGE
Bring back +/- when panning. Dismiss it when pinching.
2010-01-15 16:35:40 -08:00
Jim Miller
2cd1e6eda9 Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent.
Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.

Instead, we'll handle this separately in lockscreen.
2010-01-15 16:20:36 -08:00
Grace Kloba
4d69ac6695 Merge "DO NOT MERGE" into eclair 2010-01-14 19:29:09 -08:00
Amith Yamasani
91ccdb5f10 Security fix in accessibility - don't read out password. # 2371557
Check for password type before send accessibility event.
[Submitting for Svet]
2010-01-14 18:56:02 -08:00
Grace Kloba
fd787ba79d DO NOT MERGE
When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.

Fix http://b/issue?id=2370552
2010-01-14 18:30:45 -08:00
Grace Kloba
76336f2ccf DO NOT MERGE
If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.

Fix http://b/issue?id=2375232
2010-01-14 18:18:41 -08:00
Grace Kloba
5f01d7e268 DO NOT MERGE
Use the common ScaleGestureDetector to detect the
multi-touch motion.

Check both supportZoom and getBuiltInZoomControls
to decide whether enable the multi-touch behavior.
This should the new pinch behavior only replace the
old +/-.

Fix http://b/issue?id=2363260

Only update textWrapScale if it is different. This
should fix the performance decrease caused by initial
multi-touch code.

Fix http://b/issue?id=2371694
2010-01-13 22:02:53 -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
Adam Powell
8acdb201bd Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
2010-01-12 15:08:23 -08:00