79200 Commits

Author SHA1 Message Date
Adam Powell
d0d2cda9d4 Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
2012-06-11 13:17:44 -07:00
Daniel Sandler
18ac7826ae Put PLMN and SPN on one line in the notification panel.
We now match the keyguard's presentation: either plmn, or
spn, or "plmn|spn" (concatenated with a pipe).

Bug: 6639047
Change-Id: Ia6ae9085fbf2fe9fa4465a6f7825cb997db5e6c5
2012-06-11 16:15:14 -04:00
Craig Mautner
47adf865bd Merge "Fix exposing wallpaper on rotations and other." into jb-dev 2012-06-11 13:10:01 -07:00
Dianne Hackborn
0f6471ace7 Merge "Fix issue #6641368: can't launch gallery" into jb-dev 2012-06-11 13:09:22 -07:00
Daniel Sandler
e5011a3ad4 Suppress header flash when collapsing notifications panel.
LayoutTransition is poking through and it shouldn't be.

This change also fixes a few related animation glitches
around the carrier label and fling velocity.

Bug: 6628429
Change-Id: I6655c9f9a8c95c7abd9c6d7099957cb229b86d5a
2012-06-11 16:07:52 -04:00
Vairavan Srinivasan
ac5f998396 DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB.
This was contributed from AOSP, a fix to the management of URI write
permissions.  This is a very blatant bug, and with the new Intent ClipData
and other stuff we are making much more use of write permissions in JB,
so it is well worth taking.

Change-Id: I58c86119b4d5c13fefd090944bea139803df1a48
2012-06-11 13:06:41 -07:00
Dianne Hackborn
2bd8d0403b Fix issue #6641368: can't launch gallery
This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82
2012-06-11 12:27:05 -07:00
Jean-Baptiste Queru
6e85ad7d26 resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp
Change-Id: I44b2ba647fb3b208119d10aed3fa6fc85dddfb0d
2012-06-11 12:20:36 -07:00
Svetoslav Ganov
bbd31559f3 NPE when iterating by character and word in Launcher widgets.
1. The character and word iterators were use the application
   context to keep track of locale changes. However, for widgets
   the context from which the app context is obtained is custom
   created therefore the app context is null and the iterators
   code does not expect that. Now we are caching the locale
   and update it when the configuration changes.

bug:6642281

Change-Id: I3fd201ab9e4efd79e3bdc8afd8ee644e4354a7fb
2012-06-11 12:18:09 -07:00
Jean-Baptiste Queru
80d21f2f83 am 19703b13: Merge "Avoid memory leak in the Shutdown confirmation dialog."
* commit '19703b13a6201812ebcf73904feb700aeb1afb45':
  Avoid memory leak in the Shutdown confirmation dialog.
2012-06-11 12:03:32 -07:00
Eric Fischer
1b159f66ee Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-11 11:56:22 -07:00
Chia-chi Yeh
d667aebfb3 Merge "VPN: move VpnDialogs away from system uid." into jb-dev 2012-06-11 11:49:46 -07:00
Jeff Brown
926a5c507b Merge "Remove edge slop handling from ScaleGestureDetector." into jb-dev 2012-06-11 11:46:42 -07:00
Eric Fischer
34b729d335 Import translations. DO NOT MERGE
Change-Id: I937a8a4cc8617744f4a63d72fe946b0e2d543ede
2012-06-11 11:42:43 -07:00
Craig Mautner
b9836b9185 Fix exposing wallpaper on rotations and other.
1. Rotations do not go through standard closing of animations so the
wallpaper was not being hidden when the wallpaper target surface was
destroyed. This fix adds hiding the wallpaper when the wallpaper
target is destroyed.

2. The wallpaper target is nulled when switching from launcher home
screen to launcher all apps. In this case the wallpaper remains
visible but below visible layers. It should be hidden so that when
those layers adjust it is not exposed. (Separate fix for adjusting
wallpaper in this case will come).

Fixes bug 6629464.

Change-Id: I522f97dafc0cdcc0f933a825ec9a29d8f63590b5
2012-06-11 11:40:09 -07:00
Jean-Baptiste Queru
7372505e2f am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode"
* commit '6c50da75f696c184590c6e27d25755ee428f2afc':
  Fix Force Close when enable airplane mode
2012-06-11 11:22:15 -07:00
Dianne Hackborn
5134d711d1 am 574352a7: am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner"
* commit '574352a796e6398ff4f2b7fb1e14ada035e9a47a':
  frameworks/base: release references of UriPermissionOwner
2012-06-11 11:22:09 -07:00
Jean-Baptiste Queru
19703b13a6 Merge "Avoid memory leak in the Shutdown confirmation dialog." 2012-06-11 11:21:58 -07:00
Jean-Baptiste Queru
b8c6405fda resolved conflicts for merge of cddaf4d5 to jb-dev-plus-aosp
Change-Id: I973d361a9599b32f9eaced0748d984900590ea3d
2012-06-11 11:01:19 -07:00
Dianne Hackborn
3857681e58 am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev
* commit 'a7e3a1e0e7d308e7e78a1992038a34485d04ab29':
  Include important native processes in watchdog stacks.
2012-06-11 10:41:09 -07:00
Dianne Hackborn
a7e3a1e0e7 Merge "Include important native processes in watchdog stacks." into jb-dev 2012-06-11 10:37:51 -07:00
The Android Open Source Project
8f3523b020 Reconcile with jb-release
Change-Id: Iad375a456e4243fce9a4e651d1c831dc5bd69451
2012-06-11 09:20:57 -07:00
Jean-Baptiste Queru
6c50da75f6 am 7d77977f: Merge "Fix Force Close when enable airplane mode"
* commit '7d77977ffab9b5d7d154894afda2c70def1222f5':
  Fix Force Close when enable airplane mode
2012-06-11 08:43:08 -07:00
Jean-Baptiste Queru
7d77977ffa Merge "Fix Force Close when enable airplane mode" 2012-06-11 07:27:05 -07:00
The Android Automerger
64fd4fb65a merge in jb-release history after reset to jb-dev 2012-06-11 07:02:43 -07:00
Athimoolam Ealumalai
44030b7864 Added support for customization of mobile data setting.
Introduced system property "mobiledata", which will be
used for default behavior of the mobile data connection
either on/off.

This is analog to how the setting for "dataroaming" is
handeled.

Change-Id: Ifae8822dedfa55a515671014e2e29d43c469e701
2012-06-11 15:20:34 +02:00
Mattias Petersson
8b4b63403a Avoid memory leak in the Shutdown confirmation dialog.
How to reproduce:
1) Lock the screen.
2) Open the Phone options menu by long pressing the power
   button.
3) Tap "Power off" to display the confirmation dialog.
4) Repeat step 2 and 3 a few times (without closing the
   confirmation dialog.

Each time the confirmation dialog is displayed, a new
instance is created. A stack of confirmation dialogs are
created on the screen.

This is fixed by making sure the previous dialog is
dismissed before launching a new dialog.

Change-Id: I6b6c61ccc56364b66eed3528019f761e75bbe268
2012-06-11 10:18:09 +02:00
Chet Haase
fdb67a4dda am 913bf804: Merge "Don\'t allow apps to request scrolls to out-of-bounds positions" into jb-dev
* commit '913bf80416a81f2783376939e7ad0b956975b05c':
  Don't allow apps to request scrolls to out-of-bounds positions
2012-06-10 12:33:19 -07:00
Chet Haase
913bf80416 Merge "Don't allow apps to request scrolls to out-of-bounds positions" into jb-dev 2012-06-10 12:30:33 -07:00
Svetoslav Ganov
2622a7cd6e am b7726159: Merge "Crash in the touch explorer." into jb-dev
* commit 'b7726159e3ee29b45381ede8446c1e87fbbaa23a':
  Crash in the touch explorer.
2012-06-10 10:02:40 -07:00
Svetoslav Ganov
b7726159e3 Merge "Crash in the touch explorer." into jb-dev 2012-06-10 09:59:24 -07:00
Svetoslav Ganov
3dbb70ec9c am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev
* commit '86bbf70587602c1fd86fce1a2a4be78da45aaedc':
  Settings crash after enabling TalkBack accessibility.
2012-06-10 09:53:17 -07:00
Svetoslav Ganov
86bbf70587 Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 2012-06-10 09:50:24 -07:00
Dianne Hackborn
a8e46828bf am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"
* commit 'c99e6ee202ba9d895c96f034643fd39a035ea7f2':
  Fix dumpPowerState method
2012-06-08 18:55:56 -07:00
Dianne Hackborn
574352a796 am aa8cac86: Merge "frameworks/base: release references of UriPermissionOwner"
* commit 'aa8cac86d8f41eaf89f9e78492db2dc5c3052e0c':
  frameworks/base: release references of UriPermissionOwner
2012-06-08 18:51:18 -07:00
Dianne Hackborn
cddaf4d572 am 2d18c60a: Merge "Performance: Activity manager perf unnecessary recalc of oom_adj"
* commit '2d18c60a0b16c4abac54d373731f4b4afc74e283':
  Performance: Activity manager perf unnecessary recalc of oom_adj
2012-06-08 18:51:14 -07:00
Dianne Hackborn
c99e6ee202 am c9aa32e9: Merge "Fix dumpPowerState method"
* commit 'c9aa32e93f39f84033e4ac812efec662a1f824ac':
  Fix dumpPowerState method
2012-06-08 18:51:11 -07:00
Dianne Hackborn
aa8cac86d8 Merge "frameworks/base: release references of UriPermissionOwner" 2012-06-08 18:45:10 -07:00
Dianne Hackborn
2d18c60a0b Merge "Performance: Activity manager perf unnecessary recalc of oom_adj" 2012-06-08 18:40:04 -07:00
Dianne Hackborn
f72467ad98 Include important native processes in watchdog stacks.
Helps us track down deadlocks involving native service processes.

Bug: 6615693
Change-Id: I580047550772e29586195a8cf440141574e3f40c
2012-06-08 18:36:48 -07:00
Dianne Hackborn
c9aa32e93f Merge "Fix dumpPowerState method" 2012-06-08 18:33:48 -07:00
Svetoslav Ganov
e45c0b230b Crash in the touch explorer.
1. The touch explorer was notified for accessibility events from
   a binder thread which was poking the internal state of the
   latter which by design is not tread safe. Since the touch
   explorer is expected to be running only on the main thread
   the accessibility manager service delivers the accessibility
   events to the explorer on that thread.

bug:6635496

Change-Id: Ifdc5329e4be8e485d7f77f0fb472184494fa0d15
2012-06-08 17:49:52 -07:00
Victoria Lease
2203fab249 am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev
* commit '2e6f9be5633cf37223425b9b93c0b1512db091af':
  Fix fake bold for fallback fonts in frameworks.
2012-06-08 17:29:56 -07:00
Victoria Lease
2e6f9be563 Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 2012-06-08 17:27:28 -07:00
Eric Fischer
4bdf62727e am d9038fd5: Import translations. DO NOT MERGE
* commit 'd9038fd5568522abea033f2b826823f197c2a970':
  Import translations. DO NOT MERGE
2012-06-08 16:41:34 -07:00
Jeff Brown
076f17375b Remove edge slop handling from ScaleGestureDetector.
The edge slop code could violate invariants of ScaleGestureDetector,
such as the assumption that if an ACTION_POINTER_DOWN is observed
or if getPointerCount() >= 2, then there must be at least two
active pointers to choose from.  But due to the edge slop handling,
it was possible for findNewActiveIndex to return -1 in this
case, resulting in a crash.

Bug: 6613154
Change-Id: I4e08e38a49ab27dac1be9484e19de086bc43624a
2012-06-08 16:40:01 -07:00
Eric Fischer
d9038fd556 Import translations. DO NOT MERGE
Change-Id: I0edaecd41cef0eb158d003a3a0aafe28f49949f7
2012-06-08 16:31:51 -07:00
Svetoslav Ganov
ee33ad24cd Settings crash after enabling TalkBack accessibility.
1. AccessibilityInput filter was not checking whether the touch
   explorer instance is not null before passing it an accessibility
   event. If the accessibility event is dispatched before the input
   filter is installed but after it is created we runt into this
   case.

2. Added a missing null check in accessibility node info.

bug:6635089

Change-Id: Ia389dc1f427427eb73794f6331ccb870e0b44c55
2012-06-08 16:09:36 -07:00
Brian Colonna
d86c24745c Bug 6605167: Turning off FUL during error counts as attempt
If FUL was turned off while the error message was displayed it would
not count as a failed attempt.  This commit changes the
reportFailedAttempt callback to just report the failure rather than
report the failure and close.  This allows the FUL service to send the
reportFailedAttempt message earlier and then later close using the
existing cancel function, which closes without reporting a failed
attempt.

Change-Id: Ib3b76f477a98b149fcccc32ac39ecaeccd88a7e2
2012-06-08 15:52:01 -07:00
Jean-Baptiste Queru
3e751f1b7b am 60c77212: am 2a393a99: Merge "MountService: unlink death notification when unregistering listeners"
* commit '60c7721210d327a464fdc95dbbe504e8eb10525c':
  MountService: unlink death notification when unregistering listeners
2012-06-08 15:36:41 -07:00