Commit Graph

4437 Commits

Author SHA1 Message Date
Matthew Williams
5bdc16974a Merge "Add timeout when waiting to bind to JobService" into lmp-dev 2014-09-03 17:49:07 +00:00
Matthew Williams
75fc5258b7 Add timeout when waiting to bind to JobService
BUG: 17322886

bindService() to an invalid service might never actually result in
onServiceConnected being called , for e.g. if the client service doesn't
actually implement JobService. This wastes an execution slot as we end
up waiting forever.

Also made the javadocs clearer for the JobScheduler class.

Change-Id: Ie15ebbe18c0b7579f2ab77dd46428d354ef632c3
2014-09-03 10:47:27 -07:00
George Mount
d847f1a1e3 Merge "Additional fixes for "back" with translucent windows." into lmp-dev 2014-09-03 17:30:09 +00:00
George Mount
99c82fd1de Additional fixes for "back" with translucent windows.
Ensure background is mutated before changing its alpha.
Ensure resetViews is called when activity options is set.

Bug 16215650

Change-Id: I8482532777652a93b2c0d05c1b902516d281baf0
2014-09-03 17:29:57 +00:00
Esteban Talavera
aa924b52e9 Merge "Pass ComponentName to probing certificate methods" into lmp-dev 2014-09-03 17:22:41 +00:00
Dake Gu
dd725ec4a7 Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 2014-09-03 17:07:09 +00:00
Brian Carlstrom
f1fe51b914 Fix DevicePolicyManager javadoc
Bug: 17126717
Change-Id: Ib1d83a0e2003296ec1e17fa7c43e32c55b044df3
2014-09-03 09:00:06 -07:00
George Mount
a2327aacac Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 2014-09-03 14:21:47 +00:00
Christoph Studer
1097b15569 Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 2014-09-03 12:28:29 +00:00
Esteban Talavera
808f6ef2ac Pass ComponentName to probing certificate methods
Pass ComponentName and check whether that admin is a profile owner on DPM
get/has certificate methods (requested on the API review).

As per Change I55eec17e01489ab323f8a0e68b11592605a7b740, not keeping track of
which admins installed which certificates for now:

"Having per-admin CA certificates would be a fair bit of work. The only MDMs
we're opening this up to for now are Device and Profile Owners which 100%
manage the profile so will be the only admin.
It seems like if we keep track of "who installed which certs" it'll be a little
pointless because the answer will always be "the ProfileOwner" for every single
one."

Bug: 17005622
Change-Id: I45e9dac5236ab4ed235a341c208ac3cb6aba17da
2014-09-03 11:50:55 +00:00
Sander Alewijnse
52c0f04cbc Merge "Add the provisioning extra admin extras bundle." into lmp-dev 2014-09-03 11:43:42 +00:00
Sander Alewijnse
90f14bf53e Add the provisioning extra admin extras bundle.
Enables the MDM app running (as a regular app) in the primary user to pass
through a bundle of data with which to bootstrap the instance of itself
running as profile owner in the managed profile.

Bug:17126717
Change-Id: I28a368d13e33990b16dcd68436902e0a077d5f5d
2014-09-03 12:26:08 +01:00
George Mount
c03da0e7a9 Make Fragment Transitions match Acitivty Transitions API
Bug 17188255

Change-Id: I506a097be4010d7156caf465c95295c58612c16e
2014-09-02 15:15:12 -07:00
Dianne Hackborn
7b7b754fab Merge "Add public constant for usage stats app op." into lmp-dev 2014-09-02 21:54:56 +00:00
Dianne Hackborn
5064e7c70c Add public constant for usage stats app op.
Change-Id: Ibc031b50e9fa4f1bd0955e0afd98e8b1bd77b905
2014-09-02 10:57:16 -07:00
Dianne Hackborn
76a65d5f00 Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 2014-09-02 17:30:49 +00:00
Dianne Hackborn
d7c0395d26 Hide the interaction part of VoiceInteractionService.
Also the ability to start voice activities is turned off,
though for testing purposes it can be turned back on with a system
property.

Change-Id: I867704d32c53beeb851ceea9b45c28bf5c01ef61
2014-09-02 10:29:28 -07:00
George Mount
b4558e7e5f Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 2014-09-02 16:20:06 +00:00
Christoph Studer
223f44e1d2 NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
Bug: 15557701
Change-Id: I348b9648dbb941b2fa40b169d5ca82b9f9ba21f4
2014-09-02 17:54:17 +02:00
Christoph Studer
9c70889274 Merge "Notification: Reset view params for re-use" into lmp-dev 2014-09-01 19:26:56 +00:00
Christoph Studer
fe718433e0 Notification: Reset view params for re-use
Since RemoteViews are reapplied in SysUI, reset potentially
modified view params before configuring it.

Bug: 17175860
Change-Id: I0eceb1522461f8302e69af1a995a8d036951d1ed
2014-09-01 21:01:21 +02:00
Jorim Jaggi
17ee3ec0b8 Media notification updates
- Make text white.
- Adjust padding & metrics to redlines.
- Use different narrow layout when 3 or less notifications with big
  picture.
- Update action ripples.
- Fix progress bar size & fix color for indeterminate progress bar.
- Apply default background in SystemUI when no color is set, so we
  don't end up with white text on white background.

Bug: 15437369
Bug: 16625746
Bug: 15147533
Change-Id: Ie8bd5ad0bbca972685adb50034fff88ea97456bd
2014-09-01 17:26:51 +02:00
George Mount
3acc8f14cd Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 2014-08-31 22:52:43 +00:00
dcashman
efb1f36f09 Merge "Address KeySet API Review" into lmp-dev 2014-08-29 23:06:50 +00:00
Dake Gu
872efe45d5 ActivityTransition: fix activity not finished on back
Fixed two corner cases that called activity is not finished
on back when there is no shared element in calling activity due
to "Do not keep activity" option re-creates calling activity.

b/17333777

Change-Id: I66567efcce39b301b0febd1ce7a5d67b9ff73c3c
2014-08-29 15:33:20 -07:00
John Spurlock
bd69378419 Merge "Add a hidden system method to check call filter." into lmp-dev 2014-08-29 22:17:10 +00:00
John Spurlock
2b122f4c2e Add a hidden system method to check call filter.
As a stopgap for dialer, add a NoMan method to check
whether or not contact extras meet the current notification
interruption filter, if phone calls are allowed at all.

Bug:17299986
Change-Id: I4d7e04b974d878504ef4e3a73cb6b602cdd2f73e
2014-08-29 18:09:35 -04:00
Christoph Studer
78358b1788 Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 2014-08-29 20:37:50 +00:00
George Mount
f31d83ce70 Fix NPE in EnterTransitionCoordinator.
Bug 17324730

Change-Id: I2a8c5a4b82a7a252d4ac2319a26f3610b8e358ac
2014-08-29 13:32:20 -07:00
Adam Lesinski
cc562a811d Make UsageStats API comply with API Council
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
2014-08-29 12:52:41 -07:00
Jorim Jaggi
d05aa3ee47 Fix various problems with notification layouts
- Fix end padding for inbox notification.
- Fix that actions in BigText were clipped off.
- Fix that second line was never shown.
- Fix top padding in combination with badges.
- Fix that actions in InboxStyle were clipped off.
- Make badge style consistent with small icon.
- Fix that third line on Inbox/BigText is always 12sp (before it was
  sometimes 14sp)

Bug: 17315502
Bug: 17285898
Bug: 17311783
Bug: 17200814
Change-Id: Ic7e5e4fa07b6302a76631d0238b88239871acf49
2014-08-29 15:26:50 +02:00
Christoph Studer
b82bc785c9 NoMan: Allow listeners to specify notification trim
Bug: 16574195
Change-Id: I116080df8b73d73040cf9dbc751e25ee118641d7
2014-08-29 12:34:12 +02:00
George Mount
0f227c9a3d Merge "Fix NPE when clicking "back" quickly." into lmp-dev 2014-08-28 23:19:38 +00:00
George Mount
407d1fa52c Fix NPE when clicking "back" quickly.
Bug 17319368

Change-Id: I8cf544aefa75bd5fe4f606e185f84977a36b0cdc
2014-08-28 16:11:49 -07:00
Alan Viverette
9adfa37cfe Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 2014-08-28 22:39:27 +00:00
Christopher Tate
a43e2409ad Merge "Correct misleading javadoc for BackupHelper" into lmp-dev 2014-08-28 20:53:36 +00:00
Winson Chung
8bd5d69008 Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev 2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f Merge "NoListener: Factor out ZEN mode API" into lmp-dev 2014-08-28 18:59:41 +00:00
Alan Viverette
16a24bc435 Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
BUG: 17308290
Change-Id: I2cad1ece9eefc3c48e7574498ff9f79fe60c5f80
2014-08-28 11:19:59 -07:00
George Mount
de18420aff Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 2014-08-28 18:05:40 +00:00
George Mount
01abcaa295 Merge "Allow arbitrarily-added shared elements." into lmp-dev 2014-08-28 18:02:27 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
Christoph Studer
85a384b425 NoListener: Factor out ZEN mode API
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9 Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change

Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
2014-08-28 10:23:40 -07:00
Selim Cinek
24ac55e658 Added a warning when the profile has an owner
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.

Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
2014-08-28 15:09:28 +02:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
2014-08-28 10:56:18 +01:00
Jose Lima
fcf7083eab Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
API review request.

Bug: 17288987
Change-Id: If63f847ce630a57e4aa1e5291befe2863cb7e0c7
2014-08-27 23:09:05 -07:00
Christopher Tate
cd31d5d9ae Correct misleading javadoc for BackupHelper
Change-Id: I3865cb3bd55f04baadedb55e9f84fc516eae75b4
2014-08-27 18:49:37 -07:00
George Mount
ce725a47f6 Allow arbitrarily-added shared elements.
Bug 17112782

This allows the application developer to set any view as
a shared element so that it will avoid the enter and/or exit
transition. This will allow it to be transitioned along with
the shared element transition as well. It will also allow
the called Activity to return different shared elements than
those passed in.

Change-Id: I7b1f4f029af50dc6e2d5f025062b5669486f6427
2014-08-27 16:10:46 -07:00
Jim Miller
e193455ee2 Merge "Hide trust agent whitelisting until new API is ready." into lmp-dev 2014-08-27 21:29:12 +00:00