Commit Graph

3729 Commits

Author SHA1 Message Date
Craig Mautner
7fd239cf0a Merge "Pass ActivityOptions back from finishing activity." 2014-05-14 00:54:41 +00:00
Aaron Whyte
8f8c7f413f am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '8452776b950b26f86324636242dd302a596fae1d':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 20:41:38 +00:00
Aaron Whyte
8452776b95 am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 20:36:31 +00:00
George Mount
e8f5a255e0 Merge "Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS" 2014-05-13 19:14:16 +00:00
George Mount
0ab4c72914 Merge "Change sharedElementName to viewName." 2014-05-13 19:13:28 +00:00
Nicolas Prevot
2022597859 Merge "Resolving resources across users." 2014-05-13 17:17:18 +00:00
Craig Mautner
233ceeebab Pass ActivityOptions back from finishing activity.
Adding an ActivityOptions parameter to convertToTranslucent provides
a mechanism for delivering these options to the activity that
launched the one that is returning.

Fixes bug 13032208.
Fixes bug 14469460.
Fixes bug 14597427.

Change-Id: I4115dd3c69de9d175f6df0498a6e964fca5eca29
2014-05-13 09:51:50 -07:00
George Mount
5d1be53644 Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS
Bug 14655908

Change-Id: I60c38aca4a00410b792e2f7ce617ea78c162db55
2014-05-13 09:25:31 -07:00
Jason Monk
b01c6855c0 Merge "Switch PacUrl storage from String to Uri" 2014-05-13 15:14:50 +00:00
Nicolas Prevot
d85fc72fb8 Resolving resources across users.
When an intent is sent to another profile:
For content uris contained in this intent:
The userId of the source user is added to the userInfo part.
The ActivityManagerService has been modified to resolve resources in the user specified by the uri.
The user id to which the uri belongs to is stored in the UriPermission.

Change-Id: I43dc76895aba692bf148d276253aeaf9c75fce34
2014-05-13 14:59:52 +01:00
Sander Alewijnse
57dacb7eb0 Merge "Group account management methods and add some comments." 2014-05-13 10:30:01 +00:00
Aaron Whyte
1fb617fecd Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859

Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
2014-05-12 22:08:53 -07:00
Aaron Whyte
51f110f9d7 am d67fd642: am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
* commit 'd67fd6428a2bcaedca79fb96f971dd021e08a651':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
2014-05-13 02:31:48 +00:00
Aaron Whyte
d67fd6428a am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
* commit '6af2ef8e25844b740e84dc410ca713361bd6dbcc':
  Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
2014-05-13 02:27:00 +00:00
Aaron Whyte
6af2ef8e25 Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev 2014-05-13 02:24:13 +00:00
Aaron Whyte
d5f010e4e7 Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
This reverts commit 3f3e3e87e2.

Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
2014-05-13 02:19:10 +00:00
Aaron Whyte
71dfd44c9b am 064789ef: am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '064789efc1cd7ff96edc57f2a72fe7ad6fa8d24e':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 01:55:26 +00:00
Aaron Whyte
064789efc1 am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 01:49:16 +00:00
Aaron Whyte
24f3d0915e Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 2014-05-13 01:44:18 +00:00
Aaron Whyte
3f3e3e87e2 Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859

Change-Id: I0a8641894b41058f53a5bf241763a9a0605244d1
2014-05-12 17:20:02 -07:00
Matthew Williams
6de79e2b17 First implementation of the TaskManager internals.
Sketching out the TaskManagerService, and provide an implementation
of the Connectivity & Time controllers to use as a basis for how the
IdleMode controller will function.

Change-Id: I9163b8b9df1f8a027354720b469a0fb4c8e37194
2014-05-12 15:41:43 -07:00
George Mount
abb352a941 Change sharedElementName to viewName.
Bug 14624181

Change-Id: Ic98554c257d4115a917481eb50505373f6d58fa8
2014-05-12 13:58:25 -07:00
Chris Wren
9bbc0ca0ab Merge "notification ranking infrastructure" 2014-05-12 20:48:44 +00:00
Jason Monk
83520b9512 Switch PacUrl storage from String to Uri
Since the interface for creating/accessing PAC URLs through a
ProxyInfo is Uri based, so should the internal storage and
references.

Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
2014-05-12 15:44:32 -04:00
Tim Kilbourn
0ff8f796d9 am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev
* commit 'd6fc5115a656f9d06dd1d455f8bedd5f5eca943b':
  DO NOT MERGE Hide leanback packagemanager apis.
2014-05-12 18:43:37 +00:00
Svetoslav
a500874265 Merge "Adding shell command execution to UiAutomation." 2014-05-11 17:37:17 +00:00
Winson Chung
77dd7ce506 Merge "Fixing crash in Activity.onApplyTheme()." 2014-05-09 23:42:49 +00:00
Winson Chung
4d1a434cbd Fixing crash in Activity.onApplyTheme(). 2014-05-09 16:42:00 -07:00
Winson Chung
b7a6e198fe Merge changes I5d21645b,I8928e357
* changes:
  Fixing NPE in accessing theme attribute.
  Better transition between excluded-from-recent applications to recents.
2014-05-09 23:25:58 +00:00
Winson Chung
aca960204e Fixing NPE in accessing theme attribute.
Change-Id: I5d21645b5530f13e1709021bd818de6bdb1d6544
2014-05-09 16:18:55 -07:00
Kenny Root
e928957316 Merge "WindowManagerService: add some defensive checks" 2014-05-09 22:20:20 +00:00
Chris Wren
f953664dc1 notification ranking infrastructure
Added an ordered list of notifications (n.b. a complete ordering).
Added a mechanism for ranking to be updated asynchronously
Added onNotificationRankingUpdate to NotificationListeners
Added an opaque order update object and a convenience comparator that
  uses it to sort notifications for listeners

Repurpose scorers to be ranking preprocessors.  The preprocessors will
perform heavy-weight validation of the notification object and memoize
the results to improve efficiency of the ranking comparator.

Current internal comparator implements status quo ordering, except
that notes with a valid contact sort to the top of their priority
bucket.

Change-Id: I7244c65944a9657df41fb313b3cb5a52e149709d
2014-05-09 15:48:53 -04:00
Kenny Root
d7d2d43b49 WindowManagerService: add some defensive checks
Add checks before posting a message to the handler thread where
exceptions will crash the service.

Also make KeyguardLock fields final.

Bug: 14564617
Change-Id: I147d579d942f5fa555714d204cde52e2cd5f6154
2014-05-09 11:08:54 -07:00
Craig Mautner
d9ddf2e9d0 Merge "Introduce persistent forms of Activity lifecycle calls." 2014-05-09 17:38:53 +00:00
Craig Mautner
a002604af0 Introduce persistent forms of Activity lifecycle calls.
When an Activity is created with R.attr.persistable true different
forms of activity lifecycle methods including PersistableBundle will
be used.

Fixes bug 13736007.

Change-Id: I7e92917b300b76964257cfcc26c24e76aa19bd16
2014-05-09 09:42:37 -07:00
Jessica Hummel
91da58ded2 Allow setting password restrictions from a managed profile.
A managed profile will now share password settings with its parent.

- the current password is always stored in the parent
- admins of profiles are notified if that password changes
- checks for password quality now take the requirements of admins on
   the parent and its profiles into account

Todo:

- Currently KeyguardSecurityContainer wipes the whole device when
  the maximum fails has been reached on any profile.
  We need to limit the wipe to the profile for which the fails exceeded
  the maximum number.
- Intents with ACTION_SET_NEW_PASSWORD need to be forwarded to the parent
  of the profile when sent from a managed profile

Change-Id: I8532c59f753f8d9c61200f553f275214ad90276e
2014-05-09 16:16:02 +01:00
Svetoslav
121e0c0739 Adding shell command execution to UiAutomation.
The UiAUtomation APIs are an extension object on instrumentation and
is not null only if the instrumentation was started from the shell.
The UiAutomation APIs allow performing privileged operations for testing.
Since UiAutomation tests are just regular instrumentation tests they
cannot take advantage of the rich set of command line utilities on the
platform. This change adds a capability to UiAutomation to execute
shell commands.

bug:12927198

Change-Id: Ifb764c8e89943654f3e35d7a0c65b0b730db672f
2014-05-08 18:59:53 -07:00
Winson Chung
6e05841950 Merge "Removing the old tasks on launching recents task if they trigger a new task." 2014-05-08 22:33:20 +00:00
Winson Chung
5393dff555 Removing the old tasks on launching recents task if they trigger a new task.
- Only kill processes when removing tasks that are not started as documents
- Tweaking thumbnail animation
2014-05-08 14:25:43 -07:00
Dianne Hackborn
e22b3b1432 Usage stats!
Start reworking the usage stats service to be able
to have an API we can publish.

The basic information it keeps is still the same, though
that will be changing in the future.  The one big addition
here is that we are also now collecting configuration usage
stats.

Also introduce the start of an access model for usage stats,
using app ops.  There is an new app op that gives an application
access to usage stats even if it normally wouldn't have it,
disabled by default.

Change-Id: I6ead28e18a7f08eafd057d6ff37dd9cb216358f4
2014-05-08 13:58:13 -07:00
justinzhang
511e0d8323 DevicePolicyManager Authentication for Lock Task
Here we let DevicePolicyManager keep a list of tasks that are
allowed to start the lock task mode. This list can only be set by
a device owner app. The ActivityManager will call
DevicePolicyManager to check whether a given task can start the
lock task mode or not.

Change-Id: I650fdae43fc35bf9fd63452283f4e2bbadd11551
Bug: 14611303
2014-05-08 15:00:14 -04:00
Sander Alewijnse
650c3341be Group account management methods and add some comments.
Change-Id: I994142b557d21fbf75fc500d5ed1da9eceef6599
2014-05-08 18:00:50 +01:00
Sander Alewijnse
5c082dd22f Merge "Add API to disable account management for certain types of accounts." 2014-05-08 12:49:10 +00:00
Dan Sandler
b325c80d3d Merge "Quantum notification improvements." 2014-05-08 11:30:46 +00:00
Sander Alewijnse
5c02db60be Add API to disable account management for certain types
of accounts.

The account types with disabled account management are stored in a
blacklist in the active admin object, editable by profile owners.

Change-Id: I57dc5f709ad79674fa28dd006969283585daea24
2014-05-08 12:28:07 +01:00
Dan Sandler
26e81cf14b Quantum notification improvements.
New API introduced here: Notification.color (and
Builder.setColor()), allowing apps to specify an accent
color to be used by the template. The Quantum templates
(which are now the only kind we support) use this when
creating a circular background to draw behind the smallIcon
in the expanded form.

Additionally, the quantum and legacy templates are no longer
in superposition; all apps using Builder will get quantum.

Change-Id: Iac5e2645cc5c2346ed458763f2280ae9c6368b62
2014-05-08 01:21:55 -04:00
Vinit Deshapnde
011e1b35a6 Initial implementation of WifiScanner
This change implements basic functionality of WifiScanner. Following
functionality is enabled

1. Scanning - specify a list of channels to scan
2. Significant change detection
3. AP hotlist

Change-Id: Ieef75b96bdbbd3c7d9b9e698bd16e64d3b465254
2014-05-07 21:14:24 -07:00
Jason Monk
607562a766 Merge "Fix Docs breakage" 2014-05-08 01:00:54 +00:00
Jason Monk
41a2e33744 Fix Docs breakage
This depends on another API which evidently has not been merged
yet, this change should be reverted once the API is available
to be linked.

Change-Id: I59cb76e158fc0fac68ebd1c0de48b55e52274805
2014-05-07 19:18:38 -04:00
Jason Monk
01d1d90753 Merge "Make Lock Task API public." 2014-05-07 19:18:23 +00:00