34221 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
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
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
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
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
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
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
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
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
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
0efca17105 Tracking upgrade to bouncycastle 1.47
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
2012-09-12 10:01:00 -07:00
Kristian Monsen
e6b2a85ae0 am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev
* commit 'bd0fe8783407bc760b8e9a9952cb96a600d26ea9':
  Deprecating methods (and a constant) for JB MR1
2012-09-12 09:36:51 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
Selim Gurun
e91d5bee24 Make JavascriptInterface annotation public.
Bug: 7073422

This change makes @JavascriptInterface public and it requires
using this annotation to allow javascript access to public java
methods for API level JELLY_BEAN_MR1 and above. The behavior
does not change for API levels JELLY_BEAN and below.

Change-Id: I4108b17cf71b9ac273d7b61b1c8f7f5581e922ee
2012-09-12 08:04:26 -07:00
Jeff Sharkey
db2cc50b45 am 8b29d63d: Merge "Include user identifier in external storage paths." into jb-mr1-dev
* commit '8b29d63d0857337057db707549ef1faed39792fd':
  Include user identifier in external storage paths.
2012-09-11 23:38:38 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths.
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
2012-09-11 23:11:14 -07:00
Fabrice Di Meglio
06849e8f53 Fix SeekBar when in RTL layout direction
- set correct thumb position depending on layout direction

Change-Id: Ibc489295d28792ec7556ce3484b2d1ae47a4c704
2012-09-11 19:38:10 -07:00
Makoto Onuki
90ddc9040c A new broadcast action which is sent when profile changes
Adding it as a hidden API for now.  Should be made public later.

Bug 7148705

Change-Id: I6f5fbb8048728f355341ecdc6fd0242b45171d56
2012-09-11 18:22:53 -07:00
Fabrice Di Meglio
be06e3292b Fix bug #7148393 Switch can crash when hierarchyviewer is connected
Change-Id: I1713138a60358cc76f6cf373082a94199e85c717
2012-09-11 17:42:45 -07:00
Fabrice Di Meglio
a40627daee Enforce encapsulation for MarginLayoutParams startMargin and endMargin
Change-Id: Ibaf5ade22612dfa52173978e4b520a6407162d13
2012-09-11 17:16:36 -07:00
Jim Miller
ff2aa0bc89 Initial pass at adding Music control to new keyguard.
- View is now added or removed based on AudioManager status
- Reduced depth of hierarchy by making KeyguardTransportControl a KeyguardWidgetFrame
- Return to the status view when we return to keyguard (onScreenTurnedOn)

Change-Id: Id7f9310ce4e7daf663471117564e5670f61b1471
2012-09-11 16:21:29 -07:00
Dianne Hackborn
8d5e6f8d4a Maybe fix issue #7146119: exception in FragmentManager
Seems like we should never be dispatching input events to windows
that currently don't have focus.

Change-Id: I524796df69f3fdda4147cb37e7b85b79bad88762
2012-09-11 16:19:47 -07:00
Svetoslav Ganov
c010caef04 am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev
* commit '0bb4d078afeadf4996240d0ac41514c28e5f795a':
  Screen magnifier should handle window rebuilds correctly.
2012-09-11 15:54:50 -07:00
Svetoslav Ganov
0bb4d078af Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 2012-09-11 15:52:33 -07:00
Svetoslav Ganov
9b4125e435 Screen magnifier should handle window rebuilds correctly.
1. The way for computing the magnified region was simplistic and
   incorrect. It was ignoring window layering resulting in broken
   behavior. For example, if the IME is up, then the everything else
   is magnifed and the IME not. Now the keyguard appears and covers
   the IME but the magnified region does not expand while it would
   since the keyguard completely covers the not magnified IME window.

bug:7138937

Change-Id: I21414635aefab700ce75d40f3e913c1472cba202
2012-09-11 15:50:58 -07:00
Christopher Tate
4a7e0fc604 am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
* commit '99c0cb3b9d9fe187879ed1e03a8cc850f1906cc9':
  Set up default (random) Android IDs for all users
2012-09-11 15:23:16 -07:00
Christopher Tate
99c0cb3b9d Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev 2012-09-11 15:20:34 -07:00
Robert Greenwalt
e435859735 am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit 'f008ab727e46926bff018ef970ea8265ccc0f45d':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:11:41 -07:00
Robert Greenwalt
f008ab727e am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:09:11 -07:00
Robert Greenwalt
5d33e76cff am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3 am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
  EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Selim Gurun
86e628df36 am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
* commit '79ccb1e8a94eec580eea54db05a7ba246dbf6d92':
  Deleting the defunct SearchBox interface.
2012-09-11 15:04:44 -07:00
Selim Gurun
79ccb1e8a9 Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev 2012-09-11 15:01:21 -07:00
Christopher Tate
4dc7a68dbe Set up default (random) Android IDs for all users
Also correct some now-misleading terminology in a permission-check
log message, and fix a bug in which a system component trying to
write to a secondary user's settings would wind up writing the
owner's settings instead.

Bug 7132405

Change-Id: I5b8fafc35720390a01652e386ab5b7c0ad751abe
2012-09-11 14:51:33 -07:00