Commit Graph

33347 Commits

Author SHA1 Message Date
Michael Wright
4a8e5a05bb Merge "Generate locale-aware gamepad fallbacks for webview" 2013-12-10 22:07:00 +00:00
Alan Viverette
87079d44f1 Merge "Allow calls to AlertDialog.getButton() before dialog is shown" 2013-12-10 02:44:37 +00:00
Mathieu Chartier
4524cc649a am f2156ad2: am 6a58a2e7: am cb3ee4ed: am 3254260b: Merge "Update Dalvik process state through VMRuntime."
* commit 'f2156ad2db37ea3733cd090ec05aac3cb6860f2b':
  Update Dalvik process state through VMRuntime.
2013-12-10 02:34:44 +00:00
Mathieu Chartier
f2156ad2db am 6a58a2e7: am cb3ee4ed: am 3254260b: Merge "Update Dalvik process state through VMRuntime."
* commit '6a58a2e7e6d39180a130f3bff09aeb7afa6b1e3c':
  Update Dalvik process state through VMRuntime.
2013-12-10 02:30:45 +00:00
Mathieu Chartier
cb3ee4ed3e am 3254260b: Merge "Update Dalvik process state through VMRuntime."
* commit '3254260b8b55496468e2b897c76cadd9ecde508d':
  Update Dalvik process state through VMRuntime.
2013-12-09 18:24:29 -08:00
Alan Viverette
a1e6331942 Allow calls to AlertDialog.getButton() before dialog is shown
Change-Id: If0737ff53f3e500c2a946a18a753e279882965a2
2013-12-09 18:20:19 -08:00
Mathieu Chartier
3254260b8b Merge "Update Dalvik process state through VMRuntime." 2013-12-10 02:18:06 +00:00
Alan Viverette
72fafbb4e4 Merge "Prevent reentrance in Dialog.findViewById()" 2013-12-10 02:09:36 +00:00
Yorke Lee
d6a3660d37 Merge "Catch ActivityNotFoundException in quick contacts badge" 2013-12-10 00:23:57 +00:00
John Reck
71c8fa1776 Merge "RenderThread work" 2013-12-10 00:22:33 +00:00
John Reck
cec24ae16e RenderThread work
Hacky prototype needs a private API to enable

Change-Id: I21e0ddf3cdbd38a4036354b5d6012449e1a34849
2013-12-09 15:57:09 -08:00
Craig Mautner
bdc748af8c DO NOT MERGE: Eliminate StackBox.
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
2013-12-09 15:15:34 -08:00
Amith Yamasani
09e9cdcece DO NOT MERGE : Move some system services to their own sub package.
(Cherry pick from master)

As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: Idd92871c1828bdde81d85fe99a9c87a22d53169d
2013-12-09 15:14:41 -08:00
Mike Lockwood
e63f6f7c8d DO NOT MERGE: Remove obsolete "headless" support
Change-Id: I829fe48e6ebcb819e260646bb19ac6ddfcf07f83
2013-12-09 15:14:37 -08:00
Alan Viverette
1eb87f2c57 Merge "Unhide accessibility focus and importance getter APIs" 2013-12-09 22:52:11 +00:00
Alan Viverette
c21569aef8 Prevent reentrance in Dialog.findViewById()
BUG: 12063988
Change-Id: I58117949dde589bcdfcfe88ec90b4a6e8418fe2a
2013-12-09 14:50:41 -08:00
Lorenzo Colitti
4598ea4e5e am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
* commit '263c4788dcf45f104f8668fd6621d1a7c39689b9':
  Add address flags and scope to LinkAddress.
2013-12-09 18:34:44 +00:00
Lorenzo Colitti
30253d7a64 am 2daa0c93: Merge "Add address flags and scope to LinkAddress."
* commit '2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2':
  Add address flags and scope to LinkAddress.
2013-12-09 10:28:19 -08:00
Lorenzo Colitti
2daa0c93c4 Merge "Add address flags and scope to LinkAddress." 2013-12-07 02:43:04 +00:00
Yorke Lee
4fc601a650 Catch ActivityNotFoundException in quick contacts badge
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
2013-12-06 16:35:29 -08:00
Robert Greenwalt
5436b0cfe3 Merge "Fix descriptor leak after accepting connections" 2013-12-06 22:15:49 +00:00
Dave Platt
3e7305c6bf Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817
Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
2013-12-06 14:03:47 -08:00
Alan Viverette
36be65f56b Merge "Fix handling of constraints for unspecified height RelativeLayouts" 2013-12-06 21:54:36 +00:00
Lorenzo Colitti
64483947fd Add address flags and scope to LinkAddress.
This is necessary so that the framework can know whether an IPv6
address is likely to be usable (i.e., if it's global scope and
preferred). Also, it will simplify the address notification
methods in INetworkManagementEventObserver, which currently take
the address, the flags, and the scope as separate arguments.

1. Add flags and scope to the class and update the unit test.
   Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.
   Since most callers don't know about flags and scope, provide
   constructors that default the flags to zero and determine the
   scope from the address. Addresses notified by the kernel will
   have these properly set. Make multicast addresses invalid.
   Update the class documentation.
2. Provide an isSameAddressAs() method that compares only the
   address and prefix information between two LinkAddress
   objects. This is necessary because an interface can't have
   two addresses with the same address/prefix but different
   flags.
3. Update LinkProperties's addLinkAddress and removeLinkAddress
   to identify existing addresses to add/remove using
   isSameAddressAs instead of implicit equals(). Specifically:
   - If addLinkAddress is called with an address that is already
     present, the existing address's flags and scope are updated.
     This allows, for example, an address on an interface to go
     from preferred to deprecated when it expires, without it
     having to be removed and re-added.
   - If removeLinkAddress is called with an address that is
     present but with different flags, it deletes that address
     instead of failing to find a match.
4. Update the INetworkManagementEventObserver address
   notification methods to take just a LinkAddress instead of
   LinkAddress, flags, and scope. While I'm at it, change the
   order of the arguments for consistency with the other
   functions in the interface.

Change-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e
2013-12-06 13:54:35 +09:00
The Android Open Source Project
ebcb32f58a Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEAD
Change-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7
2013-12-05 13:10:46 -08:00
Alan Viverette
a812ab8786 Merge "Allow alert dialogs to inflate custom view layouts" 2013-12-05 19:28:18 +00:00
Alan Viverette
ec186706df Allow alert dialogs to inflate custom view layouts
Adds APIs to set a layout resource ID as an AlertDialog's custom view. To
make this useful for developers, also ensures that Dialog content is set
up when calls are made to Dialog.findViewById() before show().

BUG: 11136748
Change-Id: I29747a28d7e30f4e31fe474424109ff29e1eaa98
2013-12-05 11:10:31 -08:00
Adam Powell
a93ff445c0 Merge "Add support for cross-activity scenes and transitions" 2013-12-05 18:26:37 +00:00
Adam Powell
3a621bbdc4 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" 2013-12-05 18:06:55 +00:00
Adam Powell
cfbe9be5b3 Add support for cross-activity scenes and transitions
* Add theme attributes for specifying a top-level TransitionManager
  for an activity window.

* Add window feature for automatic content transitions. This
  automatically assigns/creates a Scene for setContentView calls.

* Add named transitions. This allows apps to define APIs for
  handshake-agreements about which exit/entrance transitions to play.

* Add new transition type for ActivityOptions. This lets the system
  use ActivityOptions to communicate transition specifics and
  arguments to the called activity.

* Have ActivityManager pass appropriate ActivityOptions through to the
  called Activity. Have the called activity call back into the caller
  to let it know which transition of a possible requested set was
  chosen.

Still to do:

* Define and pass arguments for transitions. This will require
  defining a Parcelable version of TransitionValues and deciding how
  much leeway apps should have for these things.

* Determine how to appropriately filter the ActivityOptions bundle so
  that only appropriate data reaches the target.

* Determine if generalizing the auto-Scenes functionality to
  ViewGroups is appropriate.

Change-Id: I10684b926129ab2fbc1adec9ef31767237acae79
2013-12-05 10:06:19 -08:00
Alan Viverette
517a004603 Fix handling of constraints for unspecified height RelativeLayouts
BUG: 11897546
Change-Id: If26c4be3763072f53f889574a51af16bbd6532c7
2013-12-04 17:08:44 -08:00
Adam Powell
cc84ff4f31 Add a config override for ViewConfiguration#hasPermanentMenuKey
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.

Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.

Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
2013-12-04 16:56:26 -08:00
John Spurlock
414c1f0e86 Volume panel should not clear system ui flags.
Remove private WM flag (used only by the volume panel) to force
the clearable system UI flags clear.

Instead, always lay out the volume panel as if the bars are visible,
as we do for system dialogs - and don't clear the flags.

Reverts part of I25f29af5b6518aba695b64a75977ae240b742118

Bug:11986621
Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
2013-12-04 13:47:36 -05:00
Alan Viverette
78c66c747b Merge "Defer event interception in FastScroller" 2013-12-04 01:57:12 +00:00
Michael Wright
916b649d06 Generate locale-aware gamepad fallbacks for webview
Since WebView's input handling is asynchronous its KeyEvents get
re-injected to ViewRootImpl via dispatchUnhandledKey. Make sure these
events generate the new synthetic, locale-aware keys before
using the kcm fallbacks.

Bug: 11193726
Change-Id: I2605f15130ba4bb4ad23c7ad1f3e5edfbc4be99d
2013-12-03 17:36:21 -08:00
Lorenzo Colitti
66c621496f am 13d9dfb4: am 86570409: am 453a5233: Merge "Minor changes to LinkAddress."
* commit '13d9dfb495db1431623c712b36cac1fe2f3c2fc0':
  Minor changes to LinkAddress.
2013-12-04 01:35:11 +00:00
Lorenzo Colitti
86570409a2 am 453a5233: Merge "Minor changes to LinkAddress."
* commit '453a5233086b216f2a95d0879954a2af39279095':
  Minor changes to LinkAddress.
2013-12-03 17:26:06 -08:00
Chris Wren
365c55cb9a Merge "use relative positioning for notification actions" 2013-12-03 22:30:04 +00:00
Chris Wren
8749ac8a4c use relative positioning for notification actions
Bug: 10531101
Change-Id: I5a55f708d9ffae3ec3582f85c2ff47aa6afa287d
2013-12-03 22:29:50 +00:00
Alan Viverette
4cfeedb6ae Defer event interception in FastScroller
BUG: 11273369
Change-Id: Ic380069075b6317062697298a1b928cea9f3c484
2013-12-03 14:03:24 -08:00
Lorenzo Colitti
e1ad1849f3 Minor changes to LinkAddress.
1. Simplify the parceling code. Since the InetAddress inside a
   LinkAddress can never be null, we don't need to special-case
   the case where it is.
2. Add / update method documentation.
3. Write a unit test.

Change-Id: Iba0a8cecc683d55d736419965e72ee33dd66dc22
2013-12-03 19:46:36 +09:00
Alan Viverette
06f37728b9 Merge "Generalize mapping between local and global View coordinates" 2013-12-03 02:42:34 +00:00
Alan Viverette
a3e0a30c26 Merge "Apply theme to PreferenceActivity headers" 2013-12-03 02:42:12 +00:00
Alan Viverette
f878c298e1 Apply theme to PreferenceActivity headers
BUG: 11900302
Change-Id: Ibd1b08b412f6e64b44b2f3f07d297ede8fa01367
2013-12-02 18:36:00 -08:00
Jason Sams
5a2ed23cbf Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2013-12-02 23:07:58 +00:00
Alan Viverette
8af04d8b85 Merge "Fix LongArray.addAll() to use correct arraycopy argument order" 2013-12-02 21:20:07 +00:00
Lorenzo Colitti
317d15c155 am 4806fdfb: am f226bc60: Merge "Use LinkAddress in address notifications."
* commit '4806fdfbd0fecf91584396fc0f620c97a05ab837':
  Use LinkAddress in address notifications.
2013-12-02 20:53:06 +00:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
2013-12-02 12:37:58 -08:00
Alan Viverette
4ecee5c2a6 Unhide accessibility focus and importance getter APIs
BUG: 11421928
Change-Id: Ica5cf80fc7e4c1cb0900d4d0d2e7b0d02ff13c87
2013-11-27 18:00:50 -08:00
Alan Viverette
db24d142f5 Fix LongArray.addAll() to use correct arraycopy argument order
BUG: 11709513
Change-Id: I831e74ccb008739ab315c68618c04f870f9a36a5
2013-11-27 17:38:24 -08:00