84397 Commits

Author SHA1 Message Date
Chet Haase
4277f86c63 am 0c348b6d: Merge "end() a reverse()\'d animation correctly" into jb-mr1-dev
* commit '0c348b6dd734e1d10d3b51ea95f60900789f0310':
  end() a reverse()'d animation correctly
2012-09-12 17:32:53 -07:00
Chet Haase
0c348b6dd7 Merge "end() a reverse()'d animation correctly" into jb-mr1-dev 2012-09-12 17:30:16 -07:00
Ruei-sung Lin
e7133df8ea am 51e67a0a: Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev
* commit '51e67a0a742e86415314b2d9261b1abf47a64165':
  Fix b/7087723 Patch leftover after tapping the red eye area
2012-09-12 17:25:33 -07:00
Ruei-sung Lin
51e67a0a74 Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev 2012-09-12 17:22:09 -07:00
Jeff Brown
04f6f51e09 am fd218245: Merge "Wait for installd to finish starting before booting." into jb-mr1-dev
* commit 'fd218245d236545f02d5111d8742e241ea1ffb6a':
  Wait for installd to finish starting before booting.
2012-09-12 17:10:50 -07:00
Dianne Hackborn
a0c94d333c am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev
* commit '3c78702db58af95b71b87c356f8fb0f95f3b70a7':
  Maybe fix issue #7146119: exception in FragmentManager
2012-09-12 17:10:39 -07:00
Jeff Brown
fd218245d2 Merge "Wait for installd to finish starting before booting." into jb-mr1-dev 2012-09-12 17:06:45 -07:00
Dianne Hackborn
3c78702db5 Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev 2012-09-12 17:04:42 -07:00
Jim Miller
483269b778 am 39de2b0e: Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev
* commit '39de2b0e1941c143d5b882a468e36929d978a35f':
  Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it
2012-09-12 17:01:02 -07:00
Jeff Brown
f69c812f49 Wait for installd to finish starting before booting.
Fixes a race condition where the system server might
try to access /data/user/0 before it was created.  In so
doing, the system server could end up creating a directory
in that location with the wrong permissions and everything
would promptly crash.

Bug: 7151686
Change-Id: I349c12fd2b9685d2e7f6305e74f6bf7d5816b752
2012-09-12 17:00:34 -07:00
Jim Miller
39de2b0e19 Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev 2012-09-12 16:58:17 -07:00
Craig Mautner
62f987c747 am 4be29754: Merge "Rename variables and methods for clarity." into jb-mr1-dev
* commit '4be297545362e547c2168c5d031be9b335101957':
  Rename variables and methods for clarity.
2012-09-12 16:51:06 -07:00
Craig Mautner
4be2975453 Merge "Rename variables and methods for clarity." into jb-mr1-dev 2012-09-12 16:48:15 -07:00
Craig Mautner
5c0e78c445 Rename variables and methods for clarity.
Change-Id: I2a1b2f2d5605123e55f264d45b1e7292852f2a7f
2012-09-12 16:45:36 -07:00
Jim Miller
6fba0a0c72 Music in keyguard improvements
- fix overscroll issue with workaround described in bug 7137941
- ignore noisy signals from music player that sometimes hide it

Change-Id: I6a25674ce7157bd70409f56881ec62644f5fce9b
2012-09-12 16:38:56 -07:00
Mike Lockwood
09c8c26d0b am 3ddaace1: Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev
* commit '3ddaace1a27e35eed78bdc4b6dc380d81ba6806d':
  MtpDatabase: Use actual file size instead of media database size column
2012-09-12 16:35:00 -07:00
Chet Haase
4dd1768643 end() a reverse()'d animation correctly
Previously, an animator that had been reverse()'d (and was thus
playing backwards) would not end() at the right value. That is, a call
to end() would cause the animation to snap to its original end value, not
the reverse-playing end value (i.e., its start value). Logic to handle
calculating the proper end value was not taking the reversing behavior
into account.

Issue #6583656 When you call end() after calling reverse() on an animation that has not started leads to forward animation finishing.

Change-Id: Ifca60a32d4973c21b85aed9c459f802526c0207e
2012-09-12 16:33:26 -07:00
Mike Lockwood
3ddaace1a2 Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev 2012-09-12 16:31:56 -07:00
Raph Levien
7e724af52f am 04578ee8: Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev
* commit '04578ee8bc7e47a12182ef65e211a3a330324c1f':
  Fix for bug 6872613 Need to revert back to a less hacky Arabic Font
2012-09-12 16:31:07 -07:00
Raph Levien
04578ee8bc Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev 2012-09-12 16:29:07 -07:00
Craig Mautner
1950b4348b am faecd09c: Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev
* commit 'faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f':
  Only consider hiddenRequested when deciding layout
2012-09-12 16:21:07 -07:00
Jim Miller
70f4d96fe1 am 4f77268c: Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev
* commit '4f77268c8a75dd89303b0c6bcf6ee02a97a68d1a':
  Initial pass at adding Music control to new keyguard.
2012-09-12 16:19:12 -07:00
Craig Mautner
faecd09cb7 Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev 2012-09-12 16:18:37 -07:00
Jim Miller
4f77268c8a Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 2012-09-12 16:16:21 -07:00
Makoto Onuki
c3331e4168 am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev
* commit 'b11b9fc9972ba0ae7f3d13984c5c61a8d89ca142':
  A new broadcast action which is sent when profile changes
2012-09-12 16:14:01 -07:00
Craig Mautner
c516a5c58f Only consider hiddenRequested when deciding layout
This change removes the test for hidden when deciding whether to
do a layout. So layout begins as soon as hiddenRequested occurs.
Since hidden is cleared when animations starts considering hidden
in the layout decision will delay layout until it is too late.

In particular we were not executing a relayout on return to an
activity even though the screen had been rotated while away.

Fixes bug 6615859.

Change-Id: I5fb0b4bf2c253b910a7a192da04419236d8f09d9
2012-09-12 16:13:59 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Raph Levien
2f5bdb06e7 Fix for bug 6872613 Need to revert back to a less hacky Arabic Font
Roozbeh provided an updated Arabic system UI font which does positioning
properly (using the GPOS mechanism, which is now fully supported in text
rendering), as opposed to the old workaround of using GSUB combinations.
It contains the following additional fixes:

1. Removed the new glyphs and relevant table fields created by GPOS2GSUB
2. [Kept empty glyphs for ZWSP, ZWNJ, and ZWJ]
3. Fixed a wrong GSUB substitution for Urdu Seven
4. Fixed shaping of U+06C1 HEH GOAL
5. Fixed shaping of U+06BA NOON GHUNNA
6. Removed the Rial ligature from the GSUB table
7. Tightened the Alef-Lam-Lam-Heh ligature in the GSUB table which was
getting triggered too frequently

This change just checks in the above work. I did a sanity-check
verification that Arabic text still renders reasonably in the system UI,
but did not check the above cases carefully.

Change-Id: Ie5fb9fd78d21bbfcd62b86deb327a5a2ae9321c6
2012-09-12 15:53:26 -07:00
Mike Lockwood
f6f1661457 MtpDatabase: Use actual file size instead of media database size column
Fixes problems with file transfer from device to host that can occur
if the database size value is wrong.

Bug: 6954446

Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-09-12 15:50:59 -07:00
Raph Levien
7927fe5963 am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev
* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
  Fix for b7155617 race condition in TextLayoutCache.cpp
2012-09-12 15:47:16 -07:00
Raph Levien
eb1f5349f8 Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 2012-09-12 15:44:58 -07:00
Raph Levien
13ba4e478d Fix for b7155617 race condition in TextLayoutCache.cpp
There was the possibility for a race between clearing the caches and
using fonts. This patch simply protects both under the same mLock held
by the TextLayoutCache object.

Change-Id: Ib366e16a9a9ba702a46bc078d1bc0602713991e5
2012-09-12 15:15:51 -07:00
rich cannings
4abf084b0e am 4a86019a: Temporarily turn off package verification
* commit '4a86019aeeed8420c809b94ac07edeff86972108':
  Temporarily turn off package verification
2012-09-12 15:05:02 -07:00
Ruei-sung Lin
c733a79a43 Fix b/7087723 Patch leftover after tapping the red eye area
Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
2012-09-12 15:01:29 -07:00
rich cannings
4a86019aee Temporarily turn off package verification
Bug: 7152858
Change-Id: Ic3b1900e486224dafcf3cce5db13e5f795650b51
2012-09-12 14:45:58 -07:00
Selim Gurun
0da798d458 am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev
* commit 'f4fd2eb5ee425a29aa2bed4c92ea21ac5fd7fd69':
  Minor update to addjavascriptinterface documentation
2012-09-12 13:42:59 -07:00
Selim Gurun
f4fd2eb5ee Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 2012-09-12 13:41:09 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
2012-09-12 13:36:21 -07:00
Fabrice Di Meglio
466b7a7c87 am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev
* commit '2cd35662caa824846555a3be595b7fa69337fa31':
  Fix SeekBar when in RTL layout direction
2012-09-12 13:29:58 -07:00
Fabrice Di Meglio
3736c23a67 am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev
* commit '8872465709d336083a908cb79d08661c6658265b':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
2012-09-12 13:29:53 -07:00
Fabrice Di Meglio
2cd35662ca Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 2012-09-12 13:28:17 -07:00
Fabrice Di Meglio
8872465709 Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 2012-09-12 13:26:56 -07:00
Fabrice Di Meglio
8389991f90 am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev
* commit 'b967464049d7a75face9237a89903342c4724f8a':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
2012-09-12 13:26:40 -07:00
Fabrice Di Meglio
b967464049 Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 2012-09-12 13:25:22 -07:00
Selim Gurun
b92d26f307 am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev
* commit '4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6':
  Make JavascriptInterface annotation public.
2012-09-12 12:51:02 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
55bf4c1406 am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev
* commit '743115ffcd5f7b04d8b485bbfc5440216c3aaf4f':
  Tracking upgrade to bouncycastle 1.47
2012-09-12 11:24:11 -07:00
Brian Carlstrom
743115ffcd Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 2012-09-12 11:20:37 -07:00
Elliott Hughes
d21d13d885 am 6cfba16c: am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit '6cfba16c25d04ae13c5b06d53bb495571bd83e95':
  Include <sys/socket.h> instead of <linux/socket.h>.
2012-09-12 11:11:41 -07:00
Elliott Hughes
6cfba16c25 am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit '40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc':
  Include <sys/socket.h> instead of <linux/socket.h>.
2012-09-12 11:08:45 -07:00