Commit Graph

4606 Commits

Author SHA1 Message Date
George Mount
2716ff8fa7 am aa386270: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
* commit 'aa386270cf60bb57dfcad5f0b5cded9d4a87b978':
  Fixed OOM due to visibility transitions.
2014-09-15 22:04:49 +00:00
George Mount
6521ebcfdb am 9588dada: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
* commit '9588dada867027b3938ba99b0cacfda7f784c2b7':
  Fixed enter/exit transitions working against shared elements.
2014-09-15 22:04:36 +00:00
George Mount
08ff5c14fe Merge "Fixed OOM due to visibility transitions." into lmp-dev 2014-09-15 18:12:24 +00:00
George Mount
94e7e7ef91 Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev 2014-09-15 18:12:13 +00:00
George Mount
27bc8aa583 Fixed enter/exit transitions working against shared elements.
Bug 17499971

The enter and exit transitions were targeting the shared element.
This means you'd get double transitions on the shared element.

Also, the enter transition was not properly initialized to have
an invalid target so it was targeting all views.

Change-Id: I4f3510c70bea90f09be01776bc0ad1ffb42d99d5
2014-09-15 11:08:39 -07:00
George Mount
79b2781aa7 Fixed OOM due to visibility transitions.
Have maximum size for Visibility transition bitmaps.

Also changed Visibility to avoid transitioning out child views
while transitioning out their parents.

Also moved view-to-bitmap code to common utility.

Bug 17469198

Change-Id: I05f069a267539b479da1b39cdad2cc9270c5c381
2014-09-15 11:05:36 -07:00
George Mount
48520a6c5a am e0b9e2f1: am 7d3d95e7: Merge "Fix exit transitions hiding views permanently." into lmp-dev
* commit 'e0b9e2f107660e09daa5c0a5ecc1a616cd7da097':
  Fix exit transitions hiding views permanently.
2014-09-15 14:43:29 +00:00
George Mount
2911b2046a Merge "Fix exit transitions hiding views permanently." into lmp-dev 2014-09-15 14:06:52 +00:00
Tyler Gunn
8bc3996189 am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev
* commit '2128258322aa2f90d65c1963ede79d1bffb3fce4':
  Renaming Telecomm to Telecom.
2014-09-13 18:03:04 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00
Paul Jensen
ae0477be09 am 11ee98ad: am 28b89f98: Allow libcore to perform necessary actions upon net config changes.
* commit '11ee98ade47dddefa60cf3f54a3a4c82a5d5f7ee':
  Allow libcore to perform necessary actions upon net config changes.
2014-09-13 02:36:05 +00:00
Paul Jensen
e401d17d3f Allow libcore to perform necessary actions upon net config changes.
Delegate to libcore the responsibility of performing the necessary
actions upon a network configuration change, such as a DNS
configuration change.  In the L-release, these responsibilities
now include flushing the HTTP connection pools to prevent connections
on lingering networks getting pulled from the pool inadvertently to
satisfy requests that should be going over the new network.  All such
responsibilities can now be controlled and delegated by libcore's
new NetworkEventDispatcher, designed for this purpose.

bug:17314604
Change-Id: Ic796aea9d9a1f6ecb787fbdb38b3b7f5d991829b
2014-09-12 23:59:55 +00:00
George Mount
a5757799f2 am 8f833d94: am 9032c757: Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev
* commit '8f833d941746993b0c1524fcc83e60084d9e81ae':
  Fixed: getDecor() NullPointeExceptions.
2014-09-12 23:21:38 +00:00
George Mount
bc3e75a5c1 am 1390a1a2: am cc8973e4: Merge "Reset the alpha for offscreen views." into lmp-dev
* commit '1390a1a2c6eca730b7606cc700aa1b42fc71b6ab':
  Reset the alpha for offscreen views.
2014-09-12 23:21:23 +00:00
George Mount
cb9ebc088a am 47dece77: am f607a73b: Merge "Changed method name to match Activity\'s method name." into lmp-dev
* commit '47dece7797c4fc6e19b42b605a5b9d45023a0bc9':
  Changed method name to match Activity's method name.
2014-09-12 23:21:01 +00:00
George Mount
b694e08054 Fix exit transitions hiding views permanently.
Bug 17480692

When a view was hidden prior to the transition completion,
the hidden views were being removed from the list and thus
weren't being reset to visible properly.

Change-Id: If778540156432eb19039fcec18d023d06e9c1b2a
2014-09-12 15:13:14 -07:00
George Mount
e0947064af Merge "Fixed: getDecor() NullPointeExceptions." into lmp-dev 2014-09-12 22:02:37 +00:00
George Mount
54f4ba8d7a Merge "Reset the alpha for offscreen views." into lmp-dev 2014-09-12 21:52:28 +00:00
George Mount
85ea498d86 Changed method name to match Activity's method name.
Bug 17488968

Change-Id: I3f00561d96ff33e8eaf7234934c69e3b8e2681e8
2014-09-12 14:19:40 -07:00
George Mount
653ea66a9f Reset the alpha for offscreen views.
Bug 17469303

When stripping the offscreen views from a transition, the alpha
wasn't reset, so they were made permanently invisible.

Change-Id: I2e87fff1d3b1e417997cabf9c703143355fe2c01
2014-09-12 13:58:12 -07:00
George Mount
48bd13c9cb Fixed: getDecor() NullPointeExceptions.
Bug 17481173

Change-Id: Ie6e1710cadb7d1e52515c2927dce733b3ec3eabb
2014-09-12 12:46:09 -07:00
Jessica Hummel
f5f5ed7bc3 am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev
* commit '61896e3ba7c75bd062f6fa3a3ba2c2bfd7a8826f':
  Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
2014-09-12 19:19:46 +00:00
Sander Alewijnse
fc27bbc043 am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev
* commit 'a0b249b28ea08044287a4a3558e538ab766312b3':
  Rename email extra.
2014-09-12 19:18:48 +00:00
Alexandra Gherghina
272d79c715 am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev
* commit '92f8d577c50a54e8375435813096b997d58cd368':
  Assign default icon to users at creation time and in SystemUI.
2014-09-12 19:18:43 +00:00
George Mount
a03396e080 am 42e7043d: am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev
* commit '42e7043d4f5c0f8daa8139ebb154c80e82dd3f54':
  Fixed NPE in EnterTransitionCoordinator
2014-09-12 19:18:33 +00:00
Chris Wren
2ec88183e8 am 04322209: am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev
* commit '043222093990ee001561dc86b6850056d65dfe9b':
  remove unused matchesCallFilter(Bundle, int)
2014-09-12 19:18:27 +00:00
Christoph Studer
9758f55262 am fa1033fc: am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev
* commit 'fa1033fc2119942ca3f8578e257ed52fee227f37':
  Notification: Reset chronometer visibility
2014-09-12 19:18:20 +00:00
Jessica Hummel
d4463cd8bf am 8dd58a3e: am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev
* commit '8dd58a3e642c25cf7c2b9984fbb46c0961a0da45':
  Use correct string for provisioning complete action.
2014-09-12 19:17:38 +00:00
Jessica Hummel
b38e07572f Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev 2014-09-12 18:39:22 +00:00
Sander Alewijnse
098116854e Merge "Rename email extra." into lmp-dev 2014-09-12 16:14:30 +00:00
Alexandra Gherghina
3e7115ed02 Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 2014-09-12 16:03:39 +00:00
Jessica Hummel
d8b61f62cd Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
Change-Id: I420797291fe141e295a6197c6d453d98e679ac9e
bug: 17390600
2014-09-12 16:25:30 +01:00
Alexandra Gherghina
64d4dca63f Assign default icon to users at creation time and in SystemUI.
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.

Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
2014-09-12 15:43:42 +01:00
George Mount
2418d7381f Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev 2014-09-12 14:09:23 +00:00
Chris Wren
135ce76a26 Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev 2014-09-12 14:04:33 +00:00
Christoph Studer
c30afd1e74 Merge "Notification: Reset chronometer visibility" into lmp-dev 2014-09-12 13:57:37 +00:00
Sander Alewijnse
2b338a27be Rename email extra.
Bug:17389863
Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
2014-09-12 12:28:40 +01:00
Jessica Hummel
d4aaab99bb Merge "Use correct string for provisioning complete action." into lmp-dev 2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d Use correct string for provisioning complete action.
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
2014-09-12 09:27:30 +00:00
George Mount
b6d4a7f141 am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
  Have Activity Transitions activited by a new window attribute.
2014-09-12 05:44:51 +00:00
George Mount
4188d0de10 Fixed NPE in EnterTransitionCoordinator
Bug 17478213

Change-Id: I6614f6e9e91103fbf50c49d2560088969f90685a
2014-09-11 17:47:11 -07:00
George Mount
9826f636ad Have Activity Transitions activited by a new window attribute.
Bug 17006497

Window content transitions were being enabled by default in
the Material Theme so that Activity Transitions could be
enabled by default. Unfortunately, this gave the effect that
many applications did not want -- the default transition between
window content is a fade out/in. Here, a new attribute is
added: windowActivityTransitions that is enabled by default
in the Material theme and windowContentTransitions is disabled
by default in all themes.

Change-Id: Iab453d608f00a48ff7ab7f09ce84b52cf5f20294
2014-09-11 12:23:17 -07:00
Robin Lee
ebf185a591 am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
* commit 'ac988bd9e45c5588cfffc6e67d04e54b86ecd519':
  Add DevicePolicyManager PrivateKey mgmt
2014-09-11 18:39:54 +00:00
Matthew Williams
146eccccbd am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
* commit '04f538e80614567cb175e2021265d2b6cd727a99':
  Add flag to JobParameters for job expired
2014-09-11 18:32:08 +00:00
Bernhard Bauer
26408ccd8e Add DevicePolicyManager PrivateKey mgmt
Additional device policy API to install keypairs to the keychain
silently.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
2014-09-11 19:17:00 +01:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
2014-09-11 16:04:20 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Alexandra Gherghina
ad8adc1b40 am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
  Remove package level intent forwarding.
2014-09-11 15:36:21 +00:00
Adam Connors
e107c3eb79 Remove package level intent forwarding.
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
2014-09-11 15:42:13 +01:00