Commit Graph

4623 Commits

Author SHA1 Message Date
Amith Yamasani
d587057246 am 4ad6b3ef: am 10c291a7: am e1206a34: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev
* commit '4ad6b3ef184424e36915bc046e04706f2dded0e2':
  Allow primary user profile owner to set device restrictions
2014-09-19 16:40:50 +00:00
George Mount
1a780826c2 am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev
* commit 'fbb670d9ddd16c174369cdd4575860dee6ffe8c4':
  Fix exception when fragment container has no View.
2014-09-19 16:30:33 +00:00
George Mount
74b01d84af am 4785cb7f: am 46df1eee: am af2f8cda: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev
* commit '4785cb7f541951cf3e31a84acf0767c7393fbe92':
  Fix NPE when shared element listener is null.
2014-09-19 16:30:28 +00:00
Amith Yamasani
8d9f121618 Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 2014-09-19 15:51:39 +00:00
George Mount
8f8f5f579f Merge "Fix exception when fragment container has no View." into lmp-dev 2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a Merge "Fix NPE when shared element listener is null." into lmp-dev 2014-09-19 15:39:03 +00:00
Kenny Guy
4b34d39ebd am 86d6e751: am 2d4024d9: am 8d6b38cd: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev
* commit '86d6e75144097fe6be741c2ac0756a82c98d3dc7':
  Remove suggested key names as its confusing.
2014-09-19 13:26:56 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
George Mount
1732f52895 Fix NPE when shared element listener is null.
Bug 17544867

The shared element listener will be null after the transitions
have been canceled.

Change-Id: Id1182639b44ece27fc267702623641438f9974d5
2014-09-18 15:32:47 -07:00
Craig Mautner
7d06c3758d am 1b314af5: am 85241024: am d5dad300: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev
* commit '1b314af5a1a4f0d7f4be38b52caa3a2c28a1da4e':
  Remove activity icon bitmaps from system process.
2014-09-18 22:25:39 +00:00
George Mount
0b26e4d58a Fix exception when fragment container has no View.
Bug 17535259

Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
2014-09-18 15:24:48 -07:00
Amith Yamasani
c34dc7cdeb Allow primary user profile owner to set device restrictions
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.

This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.

Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.

Bug: 17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
2014-09-18 15:14:26 -07:00
Craig Mautner
bc3126f859 Merge "Remove activity icon bitmaps from system process." into lmp-dev 2014-09-18 21:25:24 +00:00
Craig Mautner
648f69b95c Remove activity icon bitmaps from system process.
When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.

Fixes bug 17527308.

Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
2014-09-18 14:16:26 -07:00
Jeff Brown
b115e5986b am bbeae741: am fb6989e4: am 6cabbdae: am d510278d: Merge "Create an Application object for the system process." into lmp-dev
* commit 'bbeae741c75fbe7fba2a91ab4b8c7a95f987494d':
  Create an Application object for the system process.
2014-09-18 21:00:33 +00:00
Kenny Guy
d00cfc51fb Remove suggested key names as its confusing.
Update java doc to not suggest package names
as it confused people into thinking it would
limit access to that package which isn't the
case.

Bug: 15177676
Change-Id: I0736976956d8bb604e5097326c8c4316b3007d64
2014-09-18 16:34:45 +01:00
Jeff Brown
7fc8e357a4 Create an Application object for the system process.
Change-Id: Icd959fd859a7a556fbcbc519ff8646e1bf95fedc
2014-09-17 14:19:31 -07:00
George Mount
a8c1d0232b am bd0d84df: am c18f3cff: am 6140df56: am 9da2ace7: Merge "Fixed OOM due to visibility transitions." into lmp-dev
* commit 'bd0d84df3bbda95affdf4cab0e597cc126919883':
  Fixed OOM due to visibility transitions.
2014-09-16 21:04:02 +00:00
George Mount
71c0f7330b am 8c08a7e5: am 36f24d34: am f7dfba19: am 4bf9a24d: Merge "Fixed enter/exit transitions working against shared elements." into lmp-dev
* commit '8c08a7e5bd11715b32645d0ff84626a2d9c3273c':
  Fixed enter/exit transitions working against shared elements.
2014-09-16 21:03:57 +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