Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,651 Commits 3 Branches 0 Tags
ef3aa48afd30908189fa02662ac000fa08199508
Commit Graph

8071 Commits

Author SHA1 Message Date
Phil Weaver
9711357736 Merge "Allow tests to change UiAutomation flags." into nyc-dev am: d408b99 
am: 8c1e665

* commit '8c1e665bc58e6c883f0f5a939dbb777da383ce96':
  Allow tests to change UiAutomation flags.

Change-Id: Ibd6faa5f061ff88dc09310bf36b7f2a10212a8f1
 2016-04-07 16:51:49 +00:00
Phil Weaver
8c1e665bc5 Merge "Allow tests to change UiAutomation flags." into nyc-dev 
am: d408b99

* commit 'd408b995c32710f8306af83c13cccdfa70cca242':
  Allow tests to change UiAutomation flags.

Change-Id: I2b59047a63905fd8c41e08d6aa140be10c463de9
 2016-04-07 16:48:01 +00:00
Phil Weaver
d408b995c3 Merge "Allow tests to change UiAutomation flags." into nyc-dev 2016-04-07 16:35:27 +00:00
Ricky Wai
d48a049fa3 Merge "Fix work profile screen timeout policy" into nyc-dev am: bdc3961 
am: 869ecf2

* commit '869ecf225a6c6adb5d5dfe738e6d24ee0f41b1e7':
  Fix work profile screen timeout policy

Change-Id: I9664923b282f7b19f7a5a780977dedafa763d343
 2016-04-07 16:31:23 +00:00
Ricky Wai
869ecf225a Merge "Fix work profile screen timeout policy" into nyc-dev 
am: bdc3961

* commit 'bdc3961fef7b57f98bd6091b79fb511081237d8e':
  Fix work profile screen timeout policy

Change-Id: I4ebf3e47cfadcfe3f689e28f2a487c384278fb83
 2016-04-07 16:28:00 +00:00
Ricky Wai
035e924470 Fix work profile screen timeout policy 
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.

Bug: 27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2
 2016-04-07 17:16:03 +01:00
Alexander Hills
e9765a3c3a Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev am: a5ec16e 
am: 9f1e6de

* commit '9f1e6de054f836e3b35bb96998c1400435cd5d7a':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: If09863a35440db6b0fc10c021226c9b61b52283f
 2016-04-07 14:03:06 +00:00
Alex Hills
9f1e6de054 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev 
am: a5ec16e

* commit 'a5ec16e367637ba0638f906615cbfef6f4d85d13':
  Adds a content-intent-launching-activity flag to WearableExtender

Change-Id: I7af69f8e647d055a2ee9e0ac66aec7d9ee140f0b
 2016-04-07 13:59:56 +00:00
Alexander Hills
a5ec16e367 Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev 2016-04-07 13:52:58 +00:00
Alex Hills
9ab3a238b3 Adds a content-intent-launching-activity flag to WearableExtender 
This adds a flag to WearableExtender (and Action.WearableExtender)
indicating that the attached ContentIntent will launch an activity
on Wear, which lets the platform know that it can (and should)
generate a sleek transition for the launching of said intent (as
opposed to the intent causing change in the background).

Bug:28019194
Change-Id: Id8b422ea52c5e941e38558aaf31ce2cf4bb7c6f3
 2016-04-06 17:20:11 -04:00
Selim Cinek
442e05139d Merge "Changed the default if the notification time is shown" into nyc-dev am: f2a587b 
am: 1c81841

* commit '1c81841e06b7174d69d127709648e8c541c8d2db':
  Changed the default if the notification time is shown

Change-Id: Ia38e316076334d60fd543a6b1675c31c7bcc58ab
 2016-04-06 20:56:47 +00:00
Selim Cinek
4b47ff616e Merge "Deprecated the contentinfo and the number" into nyc-dev am: 82404bc 
am: ac51be5

* commit 'ac51be5b1cd048397ed9e4e0e7d6bac5b3610394':
  Deprecated the contentinfo and the number

Change-Id: I6acb57542bba80a9d4e8fadfbd480c3b3102ff3b
 2016-04-06 20:56:42 +00:00
Selim Cinek
1c81841e06 Merge "Changed the default if the notification time is shown" into nyc-dev 
am: f2a587b

* commit 'f2a587b424586ad9b0a47d022507b87a4ca96c32':
  Changed the default if the notification time is shown

Change-Id: Iae09b0652d7f392052332c7ef9114037cd0c147f
 2016-04-06 20:51:46 +00:00
Selim Cinek
ac51be5b1c Merge "Deprecated the contentinfo and the number" into nyc-dev 
am: 82404bc

* commit '82404bc0689aceb328a29fe17c277091ce793fa8':
  Deprecated the contentinfo and the number

Change-Id: I4ab5ddb1fa42221377d5603e89dfea84425344fe
 2016-04-06 20:51:42 +00:00
Selim Cinek
f2a587b424 Merge "Changed the default if the notification time is shown" into nyc-dev 2016-04-06 20:48:09 +00:00
Selim Cinek
82404bc068 Merge "Deprecated the contentinfo and the number" into nyc-dev 2016-04-06 20:45:56 +00:00
Selim Cinek
0ff1ce6075 Changed the default if the notification time is shown 
By default the notification time is not shown anymore.

Bug: 27431551
Change-Id: I68f19450d0de795a51644e939a3fd64366c0abb6
 2016-04-06 12:22:46 -07:00
Selim Cinek
0f9dd1e2f5 Deprecated the contentinfo and the number 
It was mainly adding noise to the notification
rather than useful information.

Bug: 27431551
Change-Id: Ie22c9935d60eeac1cca5d9ce97239aadfac9b3cf
 2016-04-06 12:18:31 -07:00
Tony Mak
cbd3c79f3b Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev am: a01c1f0 
am: 90bdf5a

* commit '90bdf5acb75bcdb8800e699443e9d3f0d855a5fd':
  xxxTrustAgentConfiguration should be supported in the parent DPM instance

Change-Id: I9a6c8809cc9c6ccf105048bdb075bf7cf8c8db67
 2016-04-06 18:47:02 +00:00
Tony Mak
90bdf5acb7 Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev 
am: a01c1f0

* commit 'a01c1f0d90def31de9bdd21bada11a3dfc0444b0':
  xxxTrustAgentConfiguration should be supported in the parent DPM instance

Change-Id: I75cb2133f8f54ccf938fb5d107a8dc8f2dcd6f9c
 2016-04-06 18:44:06 +00:00
Tony Mak
a01c1f0d90 Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev 2016-04-06 18:39:21 +00:00
Adam Powell
1383a09702 Merge "Fragment#setUserVisibleHint guard" into nyc-dev am: c0eb067 
am: 237ce73

* commit '237ce73ed9c93d08ed80cdebd9e6319f75ea92b3':
  Fragment#setUserVisibleHint guard

Change-Id: I93dcbdd5c61b27a1440910d5653277015ca92dbb
 2016-04-06 17:40:23 +00:00
Adam Powell
237ce73ed9 Merge "Fragment#setUserVisibleHint guard" into nyc-dev 
am: c0eb067

* commit 'c0eb067ceb25f1c6585d18874f75afd151826e2b':
  Fragment#setUserVisibleHint guard

Change-Id: If30524bf81f10649fd0d8a3b652523f1d0a62e1a
 2016-04-06 17:34:34 +00:00
Adam Powell
c0eb067ceb Merge "Fragment#setUserVisibleHint guard" into nyc-dev 2016-04-06 17:26:53 +00:00
Robin Lee
c195fd649f Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev am: 589b855 
am: 0694d00

* commit '0694d0095cd0541ba65ff783a60e8bd2621c0f4a':
  Remove bool return from setAlwaysOnVpnPackage

Change-Id: Iee41dd36989da78becf5f4d13be7a0fcd72ff1bb
 2016-04-06 17:08:37 +00:00
Robin Lee
0694d0095c Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev 
am: 589b855

* commit '589b855719ce89ba68ce1a93f15a4c79a2461adc':
  Remove bool return from setAlwaysOnVpnPackage

Change-Id: I560e03e8460401eb74170d5bf56607e3e47c94fb
 2016-04-06 17:05:38 +00:00
Robin Lee
589b855719 Merge "Remove bool return from setAlwaysOnVpnPackage" into nyc-dev 2016-04-06 17:01:24 +00:00
Adam Powell
3e10ae927c Fragment#setUserVisibleHint guard 
Bug 28026606

Change-Id: I109bce6ecd35feaa045b61a7226b2a19344d2cda
 2016-04-06 09:57:40 -07:00
Julia Reynolds
9800815036 Merge "Documentation update for interruption filters." into nyc-dev am: fa305fc 
am: 7f713ab

* commit '7f713ab1c3aa9b3189b346df38d56c75ee72e8db':
  Documentation update for interruption filters.

Change-Id: If1b75dddbe82dc2c7473088cb80e6042bafd2b9e
 2016-04-06 15:43:53 +00:00
Julia Reynolds
7f713ab1c3 Merge "Documentation update for interruption filters." into nyc-dev 
am: fa305fc

* commit 'fa305fcc6ba8f4d95b0ee33bbe8c6d9e371096e1':
  Documentation update for interruption filters.

Change-Id: I980f35331785a31275a7d0bf251cfa1a6fcfc34a
 2016-04-06 15:41:13 +00:00
Julia Reynolds
fa305fcc6b Merge "Documentation update for interruption filters." into nyc-dev 2016-04-06 15:34:09 +00:00
Robin Lee
ee5eb934e3 Remove bool return from setAlwaysOnVpnPackage 
Bug: 27533151
Change-Id: I4c656488e69cb5247dbb9cfd62d6f6f7043f9a90
 2016-04-06 16:30:22 +01:00
Julia Reynolds
dd0605b052 Documentation update for interruption filters. 
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
 2016-04-06 10:33:14 -04:00
Benjamin Franz
7f682c6ffb Merge "Document which APIs are callable on the parent instance" into nyc-dev am: 4a53c8e 
am: 9c17111

* commit '9c17111358687b1e9631f30b06efc3104ca27a95':
  Document which APIs are callable on the parent instance

Change-Id: I2bb8e778b435e39c1b13903771550def4e1bde13
 2016-04-06 12:25:40 +00:00
Benjamin Franz
9c17111358 Merge "Document which APIs are callable on the parent instance" into nyc-dev 
am: 4a53c8e

* commit '4a53c8e70253928bf89913cb313de47450d0782f':
  Document which APIs are callable on the parent instance

Change-Id: I4cd3ca078d47bcb6c3f1d34f92224e5c8eb3e05f
 2016-04-06 12:23:01 +00:00
Benjamin Franz
4a53c8e702 Merge "Document which APIs are callable on the parent instance" into nyc-dev 2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff Document which APIs are callable on the parent instance 
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.

Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
 2016-04-06 11:59:49 +01:00
Chris Tate
1f91a937f7 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev am: 71f4e14 
am: 1ecb55a

* commit '1ecb55a2beacb056f5e1cd58a748fd10f8238ac4':
  API feedback: clarify onQuotaExceeded() documentation

Change-Id: Ia5a1f1a467edd1f7dd2d025f70018291126ffce6
 2016-04-05 23:32:36 +00:00
Christopher Tate
1ecb55a2be Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 
am: 71f4e14

* commit '71f4e1440202e884f99c00a1012669a5b43c4078':
  API feedback: clarify onQuotaExceeded() documentation

Change-Id: I77d195725db157eb22c48f5c6b28dfe30dad2f2b
 2016-04-05 23:24:59 +00:00
Chris Tate
71f4e14402 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 2016-04-05 21:51:20 +00:00
George Mount
8ade4ed2af Merge "Restore fragment transaction animation state information." into nyc-dev am: dc63f7c6 
am: 5f2be08

* commit '5f2be085d2179e3409d074a4d4cca98c5db71582':
  Restore fragment transaction animation state information.

Change-Id: I6e63aba83c05bc8820f3776496138413e3091b8b
 2016-04-05 17:44:26 +00:00
George Mount
5f2be085d2 Merge "Restore fragment transaction animation state information." into nyc-dev 
am: dc63f7c6

* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
  Restore fragment transaction animation state information.

Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
 2016-04-05 17:36:11 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Tony Mak
089d840383 xxxTrustAgentConfiguration should be supported in the parent DPM instance 
1. Fix trust agent config does not persist across reboot
2. xxxTrustAgentConfiguration now supported in parent DPM instance

Bug: 27601827

Change-Id: I6ea4a089bf590d6c44be40318f3a69c35c54f796
 2016-04-05 17:42:55 +01:00
Robin Lee
1187418a61 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev am: 691b1a6 
am: 892af97

* commit '892af97b0b62a404f1f14a1824a2398c5e6927d6':
  Switch to work challenge if MP calls resetPassword

Change-Id: I8381ce2e4cbe0de6e8db4cd4c9dac853cf94fa3c
 2016-04-05 14:16:51 +00:00
Robin Lee
892af97b0b Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 
am: 691b1a6

* commit '691b1a6005ed373ad75361aa5a1bd120f138f15c':
  Switch to work challenge if MP calls resetPassword

Change-Id: I705c5a52e2a2cae96e0c0df8a2ec50c9b8ae2300
 2016-04-05 14:13:30 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Adam Lesinski
e818bb782c Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev am: a149c42 
am: ea0186c

* commit 'ea0186c2c1d4184f2469f87ac94a851c7828818c':
  Fix issue with overridden configuration in onConfigurationChanged

Change-Id: I8dff44a0a0f986446d92c4791aa757c66cd97473
 2016-04-05 02:30:45 +00:00
Adam Lesinski
ea0186c2c1 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 
am: a149c42

* commit 'a149c42071197a7759a652accb399bc58ed62bcd':
  Fix issue with overridden configuration in onConfigurationChanged

Change-Id: I034e9ad42bf8e94ca97fd536ba1498fe19f01118
 2016-04-05 02:28:26 +00:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00