Commit Graph

6529 Commits

Author SHA1 Message Date
Wale Ogunwale
e5ec210bb1 Merge "Inform activity manager of stack/task rotation bounds changes in WM" 2015-09-29 18:14:08 +00:00
Nicolas Prévot
8392b394f2 Merge "Add more methods that take a userId to PackageManager." 2015-09-29 10:00:56 +00:00
Chris Tate
f7560a697c Merge "Fix symlink handling during backup" 2015-09-29 00:16:51 +00:00
Wale Ogunwale
1ed0d89e7e Inform activity manager of stack/task rotation bounds changes in WM
Change-Id: I342093d8af1d397ab4894146f9b288bdfdc464f0
2015-09-28 15:58:37 -07:00
Ned Burns
e061a5922a am 99fa24ff: am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '99fa24ff71d93419fd9d922fa0b6bc64162e32be':
  Kill ActivityView's background thread when it's destroyed
2015-09-27 15:10:58 +00:00
Ned Burns
99fa24ff71 am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '11b87b9109717b30729e2ce01ac5014ba91c1051':
  Kill ActivityView's background thread when it's destroyed
2015-09-26 06:54:22 +00:00
Ned Burns
1b69fcbf81 am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed
2015-09-25 21:10:09 +00:00
Jorim Jaggi
fc832e3ef2 resolved conflicts for c594e935 to master
Change-Id: Ifaf8c6c2b80e5284e027278f5ff0437202439cf0
2015-09-25 11:54:05 -07:00
Jorim Jaggi
c594e9354a am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
  Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Jorim Jaggi
b7b9b31f69 am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
* commit 'ad26dc5f15d6ac13741ad8724c25ef8c58e73e81':
  Deliver camera launch source for analytics
2015-09-25 01:30:43 +00:00
Jorim Jaggi
40aa8811bc Deliver camera launch source for analytics
Bug: 24304031
Change-Id: I606bccf4b62b651e17c6e6d9472648deeab703da
2015-09-24 16:32:09 -07:00
Christopher Tate
85192a1b47 Fix symlink handling during backup
Don't canonicalize and *then* check for symlinks.  It sort of
misses the point....

Bug 22856947

Change-Id: I1c0ffa0dfeba13ca714f43eb7fd9963a0dfbcca3
2015-09-24 16:28:58 -07:00
Wale Ogunwale
83301a933f Added am command to suppress config. changes during task resize.
This command is useful for testing during development, but at some
point we will decide if allowing configuration changes during resizing
is okay or merge in http://ag/759766 to suppress configuration changes
during resizing and deliver the new config. to the app.

This functionality will be reverted once we decide.

Bug: 24380097
Change-Id: I223c08bc939e564a78e70994b599770be9d4730d
2015-09-24 15:54:08 -07:00
Nicolas Prevot
9a80e53b27 Add more methods that take a userId to PackageManager.
Add methods installPackageAsUser and installExistingPackageAsUser
and deletePackageAsUser and getPackageInfoAsUser.

BUG:23516394
Change-Id: I15e30d2ec45ab18c7f8c0ac02cfc617c50fedb44
2015-09-24 10:57:51 +01:00
Ned Burns
f4e1d10cd3 Kill ActivityView's background thread when it's destroyed
We were leaking background threads for every new ActivityView.

Change-Id: I7ce190843265567984f6cda9c85fef478b0ead38
2015-09-23 20:19:16 -04:00
Xiaohui Chen
f85c977414 Cleanup USER_OWNER in DPMS
This cl assumes device owner will continue running under user 0.

Bug: 19913735
Change-Id: I65c97f6f14fb362acbdcb6588b73787291100698
2015-09-23 18:49:00 +00:00
Todd Kennedy
898e6973ca am 739bb7c6: Merge "save "retain loader" state" into mnc-dr-dev
* commit '739bb7c694aee521995100c456cf1c8341820bec':
  save "retain loader" state
2015-09-23 18:05:58 +00:00
Nicolas Prévot
7d92c47498 Merge "Revert "Add more methods that take a userId to PackageManager."" 2015-09-23 11:35:50 +00:00
Nicolas Prévot
3355eca23e Revert "Add more methods that take a userId to PackageManager."
This reverts commit 3b0fc3cf24.

It breaks the build. I had missed other places that extend PackageManager.

Change-Id: Iff012ed4ec8d2d32821586eca85fce55ae67f5b5
2015-09-23 11:34:38 +00:00
Nicolas Prévot
daa838390c Merge "Add more methods that take a userId to PackageManager." 2015-09-23 09:49:29 +00:00
Makoto Onuki
7c7ad1a204 Merge "Make DPM/DPMS unit-testable" 2015-09-22 21:17:23 +00:00
Makoto Onuki
cc4bbeb76a Make DPM/DPMS unit-testable
- Now all services that DPMS uses are injectable.
- Introduce some wrappers to make static methods and final class mockable.
(e.g. for Binder.getCallingUid())

- In unit tests we replace those with Mockito mocks, except we use a partial
mock for PackageManager, because we use way too many methods of this and
most of them are okay to use directly.

- To install a partial mock to PackageManager, I needed to make
ApplicationPackageManager @hide public non-final.

- For a starter, added tests for DPM.setAmin().

Bug 24061108

Change-Id: I2afd51d8bc0038992d5f9be38c686260be775b75
2015-09-22 12:47:44 -07:00
Todd Kennedy
e16fb554dd save "retain loader" state
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
2015-09-22 10:16:42 -07:00
Todd Kennedy
d65fc9c460 am d8b47855: save "retain loader" state DO NOT MERGE
* commit 'd8b47855a316700751f7daead0b180005853be33':
  save "retain loader" state DO NOT MERGE
2015-09-22 07:27:18 +00:00
Todd Kennedy
d8b47855a3 save "retain loader" state DO NOT MERGE
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit c5ac16f531)
2015-09-22 07:19:14 +00:00
Chong Zhang
87b21722c2 Change resizeTask's parameter resizedByUser to constants
to indicate who initiated the resize, or if the resize should be forced.

Change-Id: Ic7021f76bec677027cbf27deeb63f92ea911a75c
2015-09-22 00:46:02 +00:00
Todd Kennedy
6b79ad655e Merge "save "retain loader" state" 2015-09-21 20:18:58 +00:00
Todd Kennedy
f8f2e334ac Merge "Save Fragment's hidden state" 2015-09-21 18:01:26 +00:00
Nicolas Prevot
3b0fc3cf24 Add more methods that take a userId to PackageManager.
Add methods installPackageAsUser and installExistingPackageAsUser
and deletePackageAsUser and getPackageInfoAsUser.

Change-Id: I9a3ff96f968b4f8d21a57cc7760679628d35c1a9
BUG:23516394
2015-09-21 11:39:42 +01:00
Filip Gruszczynski
a59ac9cd64 Preserve window during resize triggered relaunches.
This changes application code behavior when the activity relaunches due
to configuration change. It only applies to scenarios, where the
configuration change was triggered by a user generated resize of an
activity (i.e. user drags a corner of an activity and thus changes its
size).

Preserving a window means that we will keep the decor view and non
client decor view around, but remove all children views when the
activity gets destroyed. When the activity gets created again, it will
attach its new content to the preserved view hierarchy. Mind, we
actually recreate application side Window object, since some of its
features might changed, but we retain its elevation (to not trigger
relayout with new layout params).

Preserving the window also means that we don't call the window manager
service to remove and later add the window. Instead, we continue using a
single window state throughout the resize operation.

Change-Id: Ie3d2878ed09c99ff343044bfe7a29a0ba07a265e
2015-09-14 15:59:32 -07:00
Wale Ogunwale
ca9f413b70 Merge changes Id8d6f639,Iedc9e21b
* changes:
  Support creating docked stack at top/left/bottom/right half of screen
  Display dim layer when task is dragged to screen edge
2015-09-14 22:56:33 +00:00
Wale Ogunwale
59a73ca331 Support creating docked stack at top/left/bottom/right half of screen
Change-Id: Id8d6f639ed67baadb856ce84a20af8929e04cb2e
2015-09-14 15:37:47 -07:00
Alex Hills
d04c6d19a5 resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp
Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6
2015-09-14 17:03:58 -04:00
Alexander Hills
6a261fd653 Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev 2015-09-14 18:34:32 +00:00
George Mount
99c2760ed0 Merge "Ensure entering and exiting views don't match in Fragment Transitions." 2015-09-14 18:16:54 +00:00
George Mount
dd46ac3ae2 Merge "Ensure feature flags are set prior to checking Activity Transition." 2015-09-14 18:16:18 +00:00
Alan Viverette
3d2337eeb5 Cherry-pick system theme rebase to fix square UI on round watches
Our system themes were based on configurations that were added post-
init of the system theme.

I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes

If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.

This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.

Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
2015-09-14 10:56:02 -04:00
Chong Zhang
8e89b31a62 Move window moving and resizing handling to WindowManager
- add a startMoving API to initiate a window move from app, once
  the move starts WindowManager will take over the event handling.

- detect touch events along window's outside border and start
  a resize if necessary

Change-Id: Ic7e8baba34e0aa27a43173e044ffb46e93e219e0
2015-09-11 17:15:19 -07:00
Svet Ganov
d7ad54e603 Update requestPermission docs about requesting a held permission - framework
bug:23370436

Change-Id: I7c0134578f529ea698a2c237d19112d1d0a91828
2015-09-10 23:40:15 +00:00
Todd Kennedy
c5ac16f531 save "retain loader" state
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.

Bug: 23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
2015-09-10 14:37:04 -07:00
George Mount
61f8331929 Ensure entering and exiting views don't match in Fragment Transitions.
Bug 23693301

An enter or exit transition targeting an ID, name, or similar
would match by the given criteria. This disreguarded that the
exiting view should not match against the entering views, even
if they have the matching criteria.

This excludes the exiting and shared elements from participating in
the enter transition and the enter and shared elements from
participating in the exit transition.

Change-Id: I4007699d2546416008f7a9fcfdb87ff504316577
2015-09-10 13:54:28 -07:00
Gus Prevas
84cb35aa28 am 94a47646: am 27cb5670: am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev
* commit '94a4764649f3611806b95d3f1394ea9f77e30459':
  Fixes cloned notification actions missing icon.
2015-09-10 20:02:20 +00:00
Gus Prevas
94a4764649 am 27cb5670: am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev
* commit '27cb56703d350b441a2e9efc55bd16dd5b1528e7':
  Fixes cloned notification actions missing icon.
2015-09-10 19:54:13 +00:00
Gus Prevas
3d1115dba5 Merge "Fixes cloned notification actions missing icon." into cw-e-dev 2015-09-10 19:40:19 +00:00
Gus Prevas
f5bff46f6a Fixes cloned notification actions missing icon.
This change modifies the Notification.Action constructor
to populate the deprecated "icon" field based on the provided icon.
This field is still used by NotificationCompatApi20
to create a NotificationCompatBase.Action from a Notification.Action.

Bug: 23348968
Bug: 22591778
Change-Id: I3576038384d2baa12c4c75bc4124e3859aacbd13
2015-09-10 13:13:45 -04:00
George Mount
52d77f2429 Ensure feature flags are set prior to checking Activity Transition.
Bug 23764120

Window features are set in PhoneWindow.installDecor. The Activity
Transition feature is checked after onCreate. If the developer
hasn't accessed the decor View in onCreate, the Activity Transition
feature will not have been set prior to checking it. To correct
this, the decor View will be forced to be created prior to
checking the Activity Transition feature state.

Change-Id: I2c756b6736ae7f3a346f4f9bcef6936371ff03c5
2015-09-09 12:45:55 -07:00
Svetoslav
f3f02ac931 Add get_accounts app op
For each runtime permission we have an app op to toggle the
permission for legacy apps as they cannot handle permission
revocations. We were lacking an app op for get_accounts
which prevented the user from controlling access to accounts
regardelss that they change the state of the permission
toggle in the UI. Even worse the permission UI is written
with the assumption that every runtime permission has an
app op and as a result revoking the contacts group (if the
app requests the get_accounts permission) is reset back to
allowed in the UI.

bug:23854618

Change-Id: I12b83dfd22974d130e5b8e7a195421120813e2db
2015-09-09 07:31:17 -07:00
Svetoslav Ganov
5f677b114c am 4f1bd159: am db4efcfa: am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '4f1bd159d9042106d112cbf579c2daf82842f375':
  Add get_accounts app op
2015-09-09 02:08:18 +00:00
Svetoslav Ganov
db4efcfa8d am f57d9856: am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit 'f57d98564b26953b722ab0e14222f50e6515f36d':
  Add get_accounts app op
2015-09-09 01:51:37 +00:00
Svetoslav Ganov
f57d98564b am 4f7d0bc7: Merge "Add get_accounts app op" into mnc-dev
* commit '4f7d0bc7af5fbb65796d24b130b7e9e63107bc5d':
  Add get_accounts app op
2015-09-09 01:42:56 +00:00