Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,086 Commits 3 Branches 0 Tags
60cd9904bcf0ee55307bdadae04ea0bc77f63652
Commit Graph

4598 Commits

Author SHA1 Message Date
Matthew Williams
f79808b110 am 2f58db1c: am 3e3a7489: am f390c6ac: Merge "Add timeout when waiting to bind to JobService" into lmp-dev 
* commit '2f58db1cd33065c9170d8036554eba9ca79b2589':
  Add timeout when waiting to bind to JobService
 2014-09-03 19:25:10 +00:00
George Mount
cd93a304b6 am d2c53b71: am 1a91de15: am dd815989: Merge "Additional fixes for "back" with translucent windows." into lmp-dev 
* commit 'd2c53b71cf41db9c443bfeec3e595c1fc4058ef8':
  Additional fixes for "back" with translucent windows.
 2014-09-03 19:24:10 +00:00
Esteban Talavera
5fcad0a6b0 resolved conflicts for merge of 82b53329 to master 
Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46
 2014-09-03 19:57:35 +01:00
Dake Gu
103fc6da2a am a9d6e6e3: am e3842811: am a45b03f8: Merge "ActivityTransition: fix activity not finished on back" into lmp-dev 
* commit 'a9d6e6e3088e36ba731a801e676045bf65e557a8':
  ActivityTransition: fix activity not finished on back
 2014-09-03 18:04:32 +00:00
Brian Carlstrom
9844fdbd9e am 4421aaf7: am 66ce8faf: am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev 
* commit '4421aaf7558be72d83d453817f93741f267d5516':
  Fix DevicePolicyManager javadoc
 2014-09-03 17:55:29 +00:00
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
613a5f8805 am 3f1f97f9: am 12b7c53c: am 10e15c3a: Merge "Make Fragment Transitions match Acitivty Transitions API" into lmp-dev 
* commit '3f1f97f9cff3ffa28ad00bbeeada7ec70ae5c6bd':
  Make Fragment Transitions match Acitivty Transitions API
 2014-09-03 17:42:12 +00: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
Christoph Studer
eaae6de994 am a8c199d8: am 5df1917f: am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev 
* commit 'a8c199d8fa51d431d047be231a650e8142239ee1':
  NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
 2014-09-03 15:35:54 +00:00
Sander Alewijnse
e3a406ee1e am b41ea75b: am a0e6069c: am 727738ad: Merge "Add the provisioning extra admin extras bundle." into lmp-dev 
* commit 'b41ea75b7dff212e89682e07ee80224ea831e499':
  Add the provisioning extra admin extras bundle.
 2014-09-03 15:35:49 +00: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
Dianne Hackborn
07297cd527 am 2d55b767: am 1f9c4f45: am 8070053f: Merge "Add public constant for usage stats app op." into lmp-dev 
* commit '2d55b7674690fa566f927b33f7309dd68645b20a':
  Add public constant for usage stats app op.
 2014-09-03 09:13:29 +00: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
43f75b4db1 am 347a8167: am 4e784a50: am 4b9a934c: Merge "Hide the interaction part of VoiceInteractionService." into lmp-dev 
* commit '347a81674350d3848e513f678cbf689074b935fd':
  Hide the interaction part of VoiceInteractionService.
 2014-09-02 18:12:20 +00:00
Dianne Hackborn
5064e7c70c Add public constant for usage stats app op. 
Change-Id: Ibc031b50e9fa4f1bd0955e0afd98e8b1bd77b905
 2014-09-02 10:57:16 -07:00
George Mount
a46457597a am e4ff5cd7: am 8e95e5f7: am 8fd72d49: Merge "Update window always on convertTo/FromTranslucent" into lmp-dev 
* commit 'e4ff5cd75e38f8e76ea2a1b9a77e492df0a7c865':
  Update window always on convertTo/FromTranslucent
 2014-09-02 17:45:17 +00:00
Christoph Studer
5da33dd794 am 496e72ca: am b95181ac: am 7e1e2109: Merge "Notification: Reset view params for re-use" into lmp-dev 
* commit '496e72cac5103edd1ccd56a95741ec664fe9cae3':
  Notification: Reset view params for re-use
 2014-09-02 17:39:24 +00:00
Jorim Jaggi
db1600aeec am c2ce51ee: am db68bb49: am faecb0b4: Merge "Media notification updates" into lmp-dev 
* commit 'c2ce51eea33d81728420724bb6bd7bdd0f85c63a':
  Media notification updates
 2014-09-02 17:38:53 +00:00
George Mount
6c07bacd64 am 571f1373: am ae570491: am 4e51bc36: Merge "Fix NPE in EnterTransitionCoordinator." into lmp-dev 
* commit '571f1373244f2ca21345744a5029154ec536fc9d':
  Fix NPE in EnterTransitionCoordinator.
 2014-09-02 17:34:47 +00: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
dcashman
a3fc37688e am 81e03816: am e71234b3: am 219d9d38: Merge "Address KeySet API Review" into lmp-dev 
* commit '81e038162935b00ccb2f6c76be4c3f633a8a1cb5':
  Address KeySet API Review
 2014-09-02 07:11:27 +00:00
John Spurlock
4494da981b am 22c0f356: am ec6c1a68: am 84a39cb0: Merge "Add a hidden system method to check call filter." into lmp-dev 
* commit '22c0f356f8793d44f9613cd5224d771e0c419442':
  Add a hidden system method to check call filter.
 2014-09-02 07:10:46 +00: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
Christoph Studer
3ccf29ebf0 am 31942966: am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit '31942966028cbf9b669e27a8e720350b0af1268a':
  NoMan: Allow listeners to specify notification trim
 2014-09-01 11:25:43 +00:00
Adam Lesinski
a5b221254e am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '0d7dd79b8acb2ad37c004d73de4a8c8455b38427':
  Make UsageStats API comply with API Council
 2014-09-01 11:25:17 +00:00
Adam Lesinski
4c38b8a7e7 am e4dce761: am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit 'e4dce761a149113d6ecfa4cb2cee299926c54eac':
  Revert "Make UsageStats API comply with API Council"
 2014-09-01 11:25:03 +00: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
Adam Lesinski
5119ea7e35 am 43186e07: am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '43186e0784ff597be49d272d43bd7d3767f9e935':
  Make UsageStats API comply with API Council
 2014-08-29 21:07:20 +00: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