31669 Commits

Author SHA1 Message Date
Eric Fischer
aed9b810a5 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-25 14:14:55 -07:00
Christopher Tate
f5491fc1b6 Prevent construction/use of invalid restore session proxies
Possible (rare) null return was not being handled.  Fixes
bug 6554812.

Change-Id: I470e916f2156ff7ed2947d6ce21ef2816fc7f97d
2012-05-25 14:14:49 -07:00
John Reck
ec1b71adc6 Copy over the scroll position for the scrolling layer
Bug: 6557664

Change-Id: I9b1257ee0a4d75f5b445e9f72455d51e4add1c77
2012-05-25 14:02:26 -07:00
Eric Fischer
02f03668f8 Import translations. DO NOT MERGE
Change-Id: I3528164ed7d96f571cf31df0715100da5120b082
2012-05-25 13:11:43 -07:00
Gilles Debunne
1cf99631ca am 18afc622: Merge "Fix for IOOB in SearchView" into jb-dev
* commit '18afc622c3d80713a6ffb91792cce399e1715bfb':
  Fix for IOOB in SearchView
2012-05-25 12:46:09 -07:00
Gilles Debunne
18afc622c3 Merge "Fix for IOOB in SearchView" into jb-dev 2012-05-25 12:43:39 -07:00
Teng-Hui Zhu
314745cd56 am 65e08329: Merge "Better support for HTML5 audio loop." into jb-dev
* commit '65e08329ee57f2c4cda679885db700ceaca6c842':
  Better support for HTML5 audio loop.
2012-05-25 10:13:08 -07:00
Teng-Hui Zhu
65e08329ee Merge "Better support for HTML5 audio loop." into jb-dev 2012-05-25 10:10:11 -07:00
Jean-Baptiste Queru
c6df8417ea am 541803cc: am fd63c857: Merge "Wipe the user data out in any case."
* commit '541803ccc530b8cc1d8d95aa5a82ebc191fc218c':
  Wipe the user data out in any case.
2012-05-25 08:13:03 -07:00
Jean-Baptiste Queru
541803ccc5 am fd63c857: Merge "Wipe the user data out in any case."
* commit 'fd63c85742f4b12065418d48ae10be4bb12468f5':
  Wipe the user data out in any case.
2012-05-25 08:09:39 -07:00
Jean-Baptiste Queru
fd63c85742 Merge "Wipe the user data out in any case." 2012-05-25 07:31:27 -07:00
Chris Wren
af94889419 am 04b63f6f: Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev
* commit '04b63f6fb0f04e0cd56a6c2d71c8c4f1f2207758':
  Squelch the logs from SizeAdaptiveLayout.
2012-05-25 06:24:12 -07:00
Chris Wren
04b63f6fb0 Merge "Squelch the logs from SizeAdaptiveLayout." into jb-dev 2012-05-25 06:21:56 -07:00
Gilles Debunne
2427192e58 Fix for IOOB in SearchView
Bug 6476578

The latest bug report show a query.length() of 33 while
mQueryTextView.length() is 0 on line 514.

I can see 2 reasons which can explain this discrepancy:
- the mQueryTextView has a filter, which alters the text.
- some asynchronous event (IME?) changes the text in the mean time.

I would favor the second one, which seems to break a lot of single
thread assumptions in the code and generates other IOOB exceptions.

Note that depending on what they are used for, it may be more consistent
to use mQueryTextView.getText() instead of query in the following
assignment.

Change-Id: Ie8a5486b11a80543f8f90980454933c5a74c073e
2012-05-25 14:04:05 +02:00
Jim Miller
98b9221a90 am c7f82cc7: Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev
* commit 'c7f82cc7fd2b747284da692f73ea7f09b0db9099':
  Fix 6535413: Fix overlapping controls in keyguard
2012-05-24 18:48:02 -07:00
Jim Miller
c7f82cc7fd Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-dev 2012-05-24 18:45:24 -07:00
Jean-Michel Trivi
b3db8dc9f1 am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev
* commit '97594d6cea4dfcfc6bc41bcf2ef7bd2e461cd13e':
  Unhide KeyguardManager locked and secure state getters
2012-05-24 18:29:39 -07:00
Jim Miller
55c6e82883 Fix 6535413: Fix overlapping controls in keyguard
It appears that rendering order changed in recent builds.  The
transport control used to work in HC and ICS.  In any case, the fix
is to swap the positions of the two widgets, which ensures the
transport control appears on top of the status area.

Change-Id: I312d0a83e7bebbdc57f037e732e371538a781e86
2012-05-24 18:28:31 -07:00
Jean-Michel Trivi
97594d6cea Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev 2012-05-24 18:27:37 -07:00
John Reck
731327a93a am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
* commit 'f738810247b887082dbf4ca3a867f8d9e1955001':
  Support skipping a touch stream due to lack of handlers
2012-05-24 18:13:52 -07:00
John Reck
f738810247 Merge "Support skipping a touch stream due to lack of handlers" into jb-dev 2012-05-24 18:11:36 -07:00
Jean-Michel Trivi
37fde0aca0 Unhide KeyguardManager locked and secure state getters
Unhide the following methods:
  android.app.KeyguardManager.isKeyguardLocked()
  android.app.KeyguardManager.isKeyguardSecure()

Fix some javadoc typos

Change-Id: Iedcd9f6a5261b7a3b47431edff013f629e1dc45d
2012-05-24 18:09:44 -07:00
Jim Miller
4414bdefe1 am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
* commit '73bde11e624c44620819e9c93a61ca6be6e96997':
  Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:56:02 -07:00
Jim Miller
73bde11e62 Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev 2012-05-24 17:51:10 -07:00
Jim Miller
960892c0af Fix 6547012: ignore events outside the home/back/recent navigation area
This fixes the search panel to only show if touch events originate
in the home/back/recent area.

Change-Id: I370da8b5c5613b7bbab5d266ba51a61df8f3a57b
2012-05-24 17:02:31 -07:00
John Reck
c1e80a360a Support skipping a touch stream due to lack of handlers
Bug: 6317798

Change-Id: Ia1652e9030e877e270326e9e8a8b040810b89f09
2012-05-24 15:31:13 -07:00
Teng-Hui Zhu
6f62ef32e2 Better support for HTML5 audio loop.
Loop is trigger by a seek to 0 when ended on native side but there is no play
call. So on java side, we detect this and call into native side to trigger a
play after completion.
This fixed the UI problem and keep in sync with the native mode.
Beyond that, we don't need to reload for looping and we don't have the seek
to play artifacts.

bug:5461143

webkit change:
https://android-git.corp.google.com/g/#/c/193750/

Change-Id: I779f3e1fbc789832a1a99d1f17823db6b57b35df
2012-05-24 15:24:29 -07:00
Fred Quintana
d9640ec712 Add an updateAppPermission() API call to the AccountManagerService AIDL
and have the GrantCredentialsPermissionActivity call that instead of a
static so that it can be made to run in a different process than the
AccountManagerService. Protect this call by checking that the caller
has the same UID as the system process.

Bug: 6545417
Change-Id: I295e65cad68883349a47e7927c171af45c89b229
2012-05-24 14:34:43 -07:00
Romain Guy
ed13031329 am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840" into jb-dev
* commit '94328c308bc8d283841ac6434d47b4c56389a388':
  Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:28:22 -07:00
Romain Guy
94328c308b Merge "Clear bitmap references from display lists as early as possible Bug #6555840" into jb-dev 2012-05-24 14:25:44 -07:00
Romain Guy
38c2ece5ce Clear bitmap references from display lists as early as possible
Bug #6555840

Apps like Google+ with large bitmaps displayed in listivews could
run into memory issues because of these references.

Change-Id: I39486bda13ce00c5a3b6481139ad54547506a8b4
2012-05-24 14:20:56 -07:00
Fabrice Di Meglio
07e28d1e9b am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
* commit '0100625bb316ecbd99873b72756ffba8613c3456':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 10:45:54 -07:00
Fabrice Di Meglio
0100625bb3 Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev 2012-05-24 10:42:23 -07:00
George Mount
4f31367680 am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
* commit '222f56135026627637e9db4801d6532b1ff16657':
  Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 09:56:16 -07:00
George Mount
222f561350 Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev 2012-05-24 09:53:17 -07:00
Ben Murdoch
cde7efde0c am a95e9da7: Merge "Make the WebCore thread watchdog opt in." into jb-dev
* commit 'a95e9da760198b06afe0c1bbe828c2f75b52070e':
  Make the WebCore thread watchdog opt in.
2012-05-24 09:33:30 -07:00
Ben Murdoch
a95e9da760 Merge "Make the WebCore thread watchdog opt in." into jb-dev 2012-05-24 09:30:10 -07:00
Brian Colonna
af239b5f74 am fd824487: Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev
* commit 'fd824487dc2dd3eb386148af9a0618aab9a99c60':
  Fix 6449259: FUL no longer overlaps music controls
2012-05-24 08:55:29 -07:00
Brian Colonna
fd824487dc Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev 2012-05-24 08:50:58 -07:00
George Mount
7e9f62ef48 Use setCustomSelectActionModeCallback to disallow action bar.
Bug 5993716
 Use setCustomSelectActionModeCallback rather than
 setLongClickListener to disallow custom action block so
 that long press can bring up the paste window.

Change-Id: I916e77dcea7914c02191f0ecda37cd126318807d
2012-05-24 07:43:27 -07:00
Ben Murdoch
2b5d66824b Make the WebCore thread watchdog opt in.
Add a setting on WebViewCore to control whether we monitor
the responsiveness of the WebCore thread. Default is not
to monitor.

Bug: 6447214
Change-Id: Ia95e5c769d458dcd24ae50660b2f22e93851956f
2012-05-24 13:01:57 +01:00
satok
77f79a39c0 am f927e17a: Use correct spell check locale
* commit 'f927e17ae543b6edeae8200cc86c59c3ee740670':
  Use correct spell check locale
2012-05-24 01:39:35 -07:00
satok
f927e17ae5 Use correct spell check locale
Bug: 6542210
Change-Id: I414aa2321f30e396996d90fb8e90c1dbb3bb7b9e
2012-05-24 16:52:54 +09:00
Adam Powell
7c485c3804 am 75ac4e84: Merge "Fix a bug with deferred position scrolling in lists while data changes are pending" into jb-dev
* commit '75ac4e8479a415b4bec657b8f333e38d160b6b3e':
  Fix a bug with deferred position scrolling in lists while data changes are pending
2012-05-23 17:51:15 -07:00
Adam Powell
75ac4e8479 Merge "Fix a bug with deferred position scrolling in lists while data changes are pending" into jb-dev 2012-05-23 17:49:21 -07:00
Adam Powell
161abf3d44 Fix a bug with deferred position scrolling in lists while data changes
are pending

Save the pending position scroll until the data change is actually
serviced before posting it to run. This avoids handler loops on
GONE subtrees or when the view is detached.

Bug 6547649

Change-Id: Iab108cfcb7dd11ece703762d311a5f5985f38c3b
2012-05-23 17:24:27 -07:00
Fabrice Di Meglio
13fe2a5330 Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
- use an ID instead of a String for StorageVolume description
- use this ID for getting the correct localized version of the description string

Change-Id: I30f3080fce2c889be38bfdf9f5121dffcf8a99e8
2012-05-23 16:38:09 -07:00
Svetoslav Ganov
1de7af86d7 am a587b890: Merge "ActivityChooser view not handling its removal and relayout properly." into jb-dev
* commit 'a587b890bb0c2f800fe4dfd3267f26366d00d32c':
  ActivityChooser view not handling its removal and relayout properly.
2012-05-23 16:08:49 -07:00
Svetoslav Ganov
a587b890bb Merge "ActivityChooser view not handling its removal and relayout properly." into jb-dev 2012-05-23 16:06:47 -07:00
Romain Guy
a865d7d7d3 am df3633b3: Merge "Make it harder for apps to mess up ViewGroup\'s internal state Bug #6421288" into jb-dev
* commit 'df3633b38969e134c5370449b8247827c705ac1e':
  Make it harder for apps to mess up ViewGroup's internal state Bug #6421288
2012-05-23 16:05:15 -07:00