Craig Mautner
6aabf8d7c7
am fab75dc8: Merge "Turn off dimming immediately for removed windows." into jb-dev
...
* commit 'fab75dc830039b5aa1463aea55ceee2de279ec52':
Turn off dimming immediately for removed windows.
2012-06-08 11:39:12 -07:00
Craig Mautner
fab75dc830
Merge "Turn off dimming immediately for removed windows." into jb-dev
2012-06-08 11:36:36 -07:00
Chris Wren
87efc0ac2e
am 7cd46429: Merge "apply Jellybean styling to tablet system bar and panel" into jb-dev
...
* commit '7cd464292bc1012a46479898b0ee69c5e38dfe35':
apply Jellybean styling to tablet system bar and panel
2012-06-08 11:29:12 -07:00
Chris Wren
7cd464292b
Merge "apply Jellybean styling to tablet system bar and panel" into jb-dev
2012-06-08 11:26:22 -07:00
Dianne Hackborn
33e39aefdf
am 0876ab0a: Merge "Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has..." into jb-dev
...
* commit '0876ab0ac17518c479e9dffe025884870a586d9c':
Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has...
2012-06-08 11:04:13 -07:00
Dianne Hackborn
0876ab0ac1
Merge "Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has..." into jb-dev
2012-06-08 11:01:42 -07:00
Jean-Baptiste Queru
0237d04b95
am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"
...
* commit '644e43e06ffa5b493ca3682c24b8db606deed664':
Added mpga as valid MediaFile extension
2012-06-08 10:57:12 -07:00
Jean-Baptiste Queru
644e43e06f
am 3e3d641c: Merge "Added mpga as valid MediaFile extension"
...
* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
Added mpga as valid MediaFile extension
2012-06-08 10:53:40 -07:00
Jean-Baptiste Queru
3e3d641c61
Merge "Added mpga as valid MediaFile extension"
2012-06-08 10:20:57 -07:00
Adam Powell
bd0edb479f
am f2427580: Merge "Progress bar assets - once more, with feeling!" into jb-dev
...
* commit 'f2427580732b3651fb97ac4859334718d2260d15':
Progress bar assets - once more, with feeling!
2012-06-08 10:14:12 -07:00
Adam Powell
f242758073
Merge "Progress bar assets - once more, with feeling!" into jb-dev
2012-06-08 10:11:40 -07:00
Craig Mautner
236a35b77a
Turn off dimming immediately for removed windows.
...
Dimming was only turning off immediately for app-animated windows.
For removed windows dimming wouldn't turn off until the window was
completely gone.
Fixes bug 6628057.
Change-Id: I3ba6501b10a31b6f8c91012e17ad8734a84050c4
2012-06-08 09:54:59 -07:00
Kenny Root
f549099705
am af95137a: Merge "Whoops, this version number wasn\'t updated when JB was introduced!" into jb-dev
...
* commit 'af95137a9f48710d8356c5f33334b9ce60f2fb68':
Whoops, this version number wasn't updated when JB was introduced!
2012-06-08 09:53:49 -07:00
Kenny Root
af95137a9f
Merge "Whoops, this version number wasn't updated when JB was introduced!" into jb-dev
2012-06-08 09:51:04 -07:00
Kenny Root
625b92fcf7
am f27f2f8f: Merge "Delete old forward-locked apps on upgrade" into jb-dev
...
* commit 'f27f2f8f71f584471fe558845c24121e957b2cf2':
Delete old forward-locked apps on upgrade
2012-06-08 09:19:08 -07:00
Kenny Root
f27f2f8f71
Merge "Delete old forward-locked apps on upgrade" into jb-dev
2012-06-08 09:16:40 -07:00
Gilles Debunne
a8b5f65f90
am 4d94ecb2: Merge "Added a tvdpi specific background 9 patch" into jb-dev
...
* commit '4d94ecb223866b695db64065ed62b6773aa47d07':
Added a tvdpi specific background 9 patch
2012-06-08 09:15:08 -07:00
Gilles Debunne
4d94ecb223
Merge "Added a tvdpi specific background 9 patch" into jb-dev
2012-06-08 09:12:34 -07:00
Jean-Baptiste Queru
18b2c05979
am 871bcd9d: (-s ours) am b7733870: Merge "Aligning native Parcel implementation to Java."
...
* commit '871bcd9dbc9b2642e51dd586119885c54b94357b':
Aligning native Parcel implementation to Java.
2012-06-08 08:30:55 -07:00
Jean-Baptiste Queru
871bcd9dbc
am b7733870: Merge "Aligning native Parcel implementation to Java."
...
* commit 'b77338703f812cceb5458664d7690e37688de07f':
Aligning native Parcel implementation to Java.
2012-06-08 08:17:57 -07:00
Jean-Baptiste Queru
b77338703f
Merge "Aligning native Parcel implementation to Java."
2012-06-08 08:03:03 -07:00
Chris Wren
1e8f65d989
apply Jellybean styling to tablet system bar and panel
...
Bug: 6546070
Change-Id: I933883857747931388026e0beefcf092a00d531a
2012-06-08 07:57:45 -07:00
Bart Sears
009b4eb099
am ce4eeadf: Merge "Fix for U+0449 (lowercase shcha) glyph in Roboto Light. Bug: 6609392" into jb-dev
...
* commit 'ce4eeadf814c3dfbda9e58359159f1b7058d9b83':
Fix for U+0449 (lowercase shcha) glyph in Roboto Light. Bug: 6609392
2012-06-07 23:22:18 -07:00
Bart Sears
ce4eeadf81
Merge "Fix for U+0449 (lowercase shcha) glyph in Roboto Light. Bug: 6609392" into jb-dev
2012-06-07 23:20:20 -07:00
Svetoslav Ganov
7a91def99a
am 75fb3e7a: Merge "Cannot click on the last touch explored auto-completion item." into jb-dev
...
* commit '75fb3e7ac25099d9f6f0a4c34ee0aa7db2dd5d65':
Cannot click on the last touch explored auto-completion item.
2012-06-07 19:55:08 -07:00
Svetoslav Ganov
75fb3e7ac2
Merge "Cannot click on the last touch explored auto-completion item." into jb-dev
2012-06-07 19:52:19 -07:00
Adam Powell
39987ceb72
Progress bar assets - once more, with feeling!
...
Bug 6628236
Change-Id: I06369f37caf3db8b00047822f5fda44ce380e01b
2012-06-07 19:23:36 -07:00
Dianne Hackborn
1db36528b1
Whoops, this version number wasn't updated when JB was introduced!
...
Change-Id: I9c9cd658cc1cba99b84059c8873c22b21b9f3c19
2012-06-07 18:20:55 -07:00
Dianne Hackborn
d0c5f515c0
Fix issue #6295373 : "Package com.google.android.apps.authenticator2 has...
...
...mismatched uid: X on disk, Y in settings" errors on Froyo and Gingerbread
Deal more gracefully with the uid changing in three ways:
1. If the uid on disk has become root, then have installd change it to
the application's uid. This is to correct a potential case where
installd was interrupted while linking or unlinking the libs dir,
during which it temporarily changes the owner of the dir to root
so that a malicious app can not get in its way. So if the uid on
disk has become root, we assume we can safely just change it back
to the correct uid.
2. When scaning packages at boot, use the same "delete and rebuild data
directory" code for third party applications as we have for system
applications. This allows us to at least end up in a state where the
app will run, even if its data is lost.
3. But we really don't want to get in to case 2, so if an application
update is being installed and we find that the uid we now have for
the app is different than the one on disk, fail the update. This will
protect against for example a developer changing the sharedUserId of
their app and getting into this bad state.
Bug: 6295373
Change-Id: Ic802fdd818ac62449ff3c61d1fff1aa4d4942f39
2012-06-07 16:57:57 -07:00
Svetoslav Ganov
385d9f24b5
Cannot click on the last touch explored auto-completion item.
...
1. When typing into an auto completion edit field a list of completions pops up and if
the user touch explores the list and tries to double tap to select the touched
completion the latter is not selected.
The auto completion is a popup that does not take input focus and is overlaid on
top of the window that has input focus. The touch explorer was clicking on the
location of the accessibility focus if the last touch explored location is within
the bounds of the active window. In this case this was the window with the edit
text into which the user is typing. The check performed by the touch explorer
was missing the case when the last touch explored location was within the bounds
of the active window but it actually was deloverd to another overlaid window.
Now we are poking on the accessibility focus location if the last explored
location is within the active window and was delivered to it.
bug:6629535
Change-Id: Ie66d5bb81ab021f2bb0414339b7de26d96826191
2012-06-07 16:35:11 -07:00
Keun young Park
765d3d13c9
am fca9ff38: Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev
...
* commit 'fca9ff387178b4d3c4205427e2d52ef4a5996fe2':
rename exif to exif_jni due to refactoring in external/jhead
2012-06-07 16:34:36 -07:00
John Reck
b47601279f
am 839fd414: Merge "Eliminate gap between finalize() and destroy()" into jb-dev
...
* commit '839fd4144e369a9bde4fff4a5a2b6cc9e078cef8':
Eliminate gap between finalize() and destroy()
2012-06-07 16:34:34 -07:00
Kenny Root
6dd3a0d61f
am 87353093: Merge "Measure ASECs for forward-locked apps" into jb-dev
...
* commit '87353093ef98f13c45c418884734460a1b09c149':
Measure ASECs for forward-locked apps
2012-06-07 16:34:32 -07:00
John Reck
13b9d28268
am 0e0ce11e: Merge "Stay in layer scroll if nothing to scroll" into jb-dev
...
* commit '0e0ce11e57a9506ad4429269732f3b7144875a84':
Stay in layer scroll if nothing to scroll
2012-06-07 16:34:30 -07:00
Jean-Michel Trivi
dbb9e38673
am 6a5f9f6d: Merge "Configuration for lock and UI sound levels" into jb-dev
...
* commit '6a5f9f6ddbfcb97a25436ad34be39fc7b3b45168':
Configuration for lock and UI sound levels
2012-06-07 16:34:27 -07:00
Keun young Park
fca9ff3871
Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev
2012-06-07 16:19:02 -07:00
John Reck
839fd4144e
Merge "Eliminate gap between finalize() and destroy()" into jb-dev
2012-06-07 15:57:56 -07:00
Kenny Root
87353093ef
Merge "Measure ASECs for forward-locked apps" into jb-dev
2012-06-07 15:40:54 -07:00
John Reck
0e0ce11e57
Merge "Stay in layer scroll if nothing to scroll" into jb-dev
2012-06-07 15:29:46 -07:00
Jean-Michel Trivi
6a5f9f6ddb
Merge "Configuration for lock and UI sound levels" into jb-dev
2012-06-07 15:28:51 -07:00
John Reck
919c89e204
Stay in layer scroll if nothing to scroll
...
Bug: 6628376
The issue here is that contentX & contentY can both be 0 if we are scrolling
slowly enough as they are adjusted by the page's scale and can thus round down.
However, this would result in us falling out of layer drag mode even though
we haven't tried to scroll past the edge of the layer. Detect this case, and
stay in layer scroll mode.
Change-Id: I3c655d0d03e8f89887abbe718bd24699c133ee1a
2012-06-07 14:45:34 -07:00
Kenny Root
41668981ae
am 906272b9: Merge "Only call fixSdPermissions when appropriate" into jb-dev
...
* commit '906272b977f5bfd977ca69d0826bb95ba3fcda63':
Only call fixSdPermissions when appropriate
2012-06-07 14:23:42 -07:00
Kenny Root
906272b977
Merge "Only call fixSdPermissions when appropriate" into jb-dev
2012-06-07 14:21:14 -07:00
Gilles Debunne
11c15cfb4e
am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev
...
* commit '78c6aeeffac7b665a0e1d822e88c92ef2b5ef353':
Fixed cast exception with selectable text.
2012-06-07 14:18:44 -07:00
Gilles Debunne
78c6aeeffa
Merge "Fixed cast exception with selectable text." into jb-dev
2012-06-07 14:15:40 -07:00
Eric Fischer
61168975d0
am 0646411c: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '0646411cbd91039e843c0f3067ea0a379176978a':
Import translations. DO NOT MERGE
2012-06-07 14:00:58 -07:00
Eric Fischer
0646411cbd
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-07 13:56:09 -07:00
Svetoslav Ganov
8114f439fe
am ddbcce81: Merge "Cannot interact with dialogs when IME is up and on not touch explored popups." into jb-dev
...
* commit 'ddbcce81acaa744d35c727d9a530b04255fab5af':
Cannot interact with dialogs when IME is up and on not touch explored popups.
2012-06-07 13:53:39 -07:00
Eric Fischer
bd646b8e1c
Import translations. DO NOT MERGE
...
Change-Id: Ic209397930750934fe3ab136ab3a4586257c1ed3
2012-06-07 13:52:56 -07:00
Svetoslav Ganov
ddbcce81ac
Merge "Cannot interact with dialogs when IME is up and on not touch explored popups." into jb-dev
2012-06-07 13:50:58 -07:00