Commit Graph

10994 Commits

Author SHA1 Message Date
Selim Cinek
2c2b931efd Merge changes from topic 'media_colorization_master'
* changes:
  Make music notifications not dimmable
  Implementing gradual image fade for the media template
  Extracting the notification colors based on the album art
  Moved notification builder creation to the background
2017-04-27 21:33:33 +00:00
TreeHugger Robot
8618e94820 Merge "Updating docs for RemoteInput non-textual inputs per API review request." 2017-04-27 20:55:26 +00:00
Amith Yamasani
b979c3aa0d Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev am: 3a4987bbe7
am: 73bdb10bc8

Change-Id: I3161578f7ffd31916e7f072f8a71d0367d402170
2017-04-27 20:51:01 +00:00
Makoto Onuki
1bfe94164f Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev am: 301663a61b
am: 27521581fb

Change-Id: I8b0443ccf4a876b4de0d6de6d1af7909a4dee00e
2017-04-27 20:32:27 +00:00
Pavel Grafov
a4bc6bae4a Merge "Use InetAddress instead of String in network events." into oc-dev am: 54e534d6e7
am: c3ae946f66

Change-Id: If08ae7a4eed5d56c02c0d67a3d3fcffe46f982b5
2017-04-27 20:24:11 +00:00
TreeHugger Robot
3a4987bbe7 Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev 2017-04-27 20:21:49 +00:00
Makoto Onuki
301663a61b Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev 2017-04-27 20:03:22 +00:00
TreeHugger Robot
54e534d6e7 Merge "Use InetAddress instead of String in network events." into oc-dev 2017-04-27 19:53:58 +00:00
Chad Brubaker
d65e8e8326 Merge "Allow apps to provide the Instant App installer extra information" into oc-dev am: a9d0e6b205
am: f4488dabd5

Change-Id: I6310b54fc3f5e11feb926fe904d33c4cf67db669
2017-04-27 19:51:45 +00:00
Selim Cinek
bea598beae Implementing gradual image fade for the media template
Test: play music
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes: 36561228
2017-04-27 12:38:17 -07:00
Selim Cinek
fb49ffc96a Extracting the notification colors based on the album art
Media notifications are now extracting the background and
foreground colors from the album art.

Test: manual, play different songs
Bug: 36561228
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
2017-04-27 12:37:34 -07:00
Chad Brubaker
a9d0e6b205 Merge "Allow apps to provide the Instant App installer extra information" into oc-dev 2017-04-27 19:30:57 +00:00
Andrii Kulian
d1ef87c4aa Merge "Hide onMovedToDisplay callback" into oc-dev am: bfe5aa23e8
am: a63c3863a3

Change-Id: I4aadf1db9fbdb692776f517532e760d3e49e58a1
2017-04-27 18:29:00 +00:00
Andrii Kulian
bfe5aa23e8 Merge "Hide onMovedToDisplay callback" into oc-dev 2017-04-27 18:09:17 +00:00
Pavel Grafov
a6ea92097c Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.

Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.

Bug: 37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
2017-04-27 18:53:11 +01:00
George Mount
c4066d29b0 Merge "Address API council feedback." into oc-dev am: 4a71842dbd
am: b19b342466

Change-Id: I0e2fc8e10ba039872c78baef6000d630ef10a5e0
2017-04-27 14:24:55 +00:00
George Mount
4a71842dbd Merge "Address API council feedback." into oc-dev 2017-04-27 14:06:16 +00:00
Victor Chang
e04abdcd1a Merge "Add STATE_USER_SETUP_COMPLETE" 2017-04-27 10:57:32 +00:00
Tony Mak
217f6066e8 Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev am: 424dd39e25
am: d272847267

Change-Id: I255abd2bc0996a1d4daf9486da5ee11b5ea079c0
2017-04-27 10:38:59 +00:00
Tony Mak
60b2d05160 Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev am: f4362fda59
am: 6fbfc05965

Change-Id: I0f286d3247bf3d4f6cd30e51f363a20d4b950c46
2017-04-27 10:37:39 +00:00
TreeHugger Robot
424dd39e25 Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev 2017-04-27 09:41:18 +00:00
TreeHugger Robot
f4362fda59 Merge "bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN" into oc-dev 2017-04-27 09:41:18 +00:00
Julia Reynolds
d6247427ac Merge "Api updates" into oc-dev am: f84467e19f
am: 7ee513c27b

Change-Id: Iafbf2f2ca92b288de7bded40772cd15eca2012ee
2017-04-27 05:15:11 +00:00
TreeHugger Robot
f84467e19f Merge "Api updates" into oc-dev 2017-04-27 04:51:46 +00:00
Andrii Kulian
cadaccedac Hide onMovedToDisplay callback
There are no usages in O, so not exposing it for now.

Bug: 37638275
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I30a8549191ac1cfad0fb1e4db71a702862c0e503
2017-04-26 18:09:54 -07:00
Winson Chung
b6efdda9a0 Updating PiP API and documentation. am: 709904f800
am: 1aef4da275

Change-Id: Id65ec5a93ef0eccbf4c06a7e3886e08f4d2ca913
2017-04-27 01:01:18 +00:00
Winson Chung
709904f800 Updating PiP API and documentation.
- Renaming PictureInPictureArgs to PictureInPictureParams, making it
  immutable and built with a builder class.  In addition, making the
  aspect ratio rational.
- Moving the check to get max number of actions to the activity to have
  more flexibility going forward
- Also ensures that enterPictureInPictureMode() returns true if the
  activity is already in PiP mode.
- Will follow up with CL to remove PictureInPictureArgs and related methods
  once this CL drops

Bug: 35765211
Bug: 37638323
Bug: 37637423
Bug: 37636674
Bug: 36342780
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: android.app.cts.PictureInPictureParamsBuilderTest

Change-Id: I54a487d55a59c9ce8ac7bd6c80c61209c8b26224
Signed-off-by: Winson Chung <winsonc@google.com>
2017-04-26 17:14:19 -07:00
Makoto Onuki
69d7bfe373 Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev am: 397335d926
am: 9e3f4ac593

Change-Id: Ia95a458719f12454347adada6ca5a4f18c63e48b
2017-04-27 00:11:47 +00:00
Makoto Onuki
397335d926 Merge "Enhance DeviceAdminService javadoc and remove TODO." into oc-dev 2017-04-26 23:34:00 +00:00
Makoto Onuki
e92f79450a Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26
Also make sure to return the legacy value from
RunningAppProcessInfo.importance.

Bug: 37636026

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t 'android.app.cts.ActivityManagerTest#testGetRunningAppProcesses'
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t 'android.app.cts.ActivityManagerTest#testGetMyMemoryState'
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t 'android.app.cts.AlertWindowsTests'
Change-Id: Ie04e4dfa40c28ea391ae5ce3c769c6f8ee70a43d
2017-04-26 16:12:43 -07:00
Tony Mak
3165743c50 setAffiliationIds and getAffiliationIds uses set instead of list
Didn't use @remove because java doesn't support two methods differs from
the return type only.

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_unaffiliatedUser
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module DevicePolicyManager  --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest

Change-Id: Ic7c7221ef5e680a6765f028c2ab73d4c2f908c58
Fix: 37622682
2017-04-26 22:42:19 +00:00
George Mount
a0ffafffdd Address API council feedback.
Bug 37636027

Change FragmentTransaction#setAllowOptimization() to
FragmentTransaction#setReorderingAllowed().

Test: I729dc05bde1f6eba6ff8d38eb15f65de777c14bb
Change-Id: I24c35aad95ffa14d2e2fa092ae71d3d459e6d648
2017-04-26 14:37:57 -07:00
Chad Brubaker
0606861de5 Allow apps to provide the Instant App installer extra information
Apps may want to provide additional context information to the instant
app installer in order to allow the installer to make smarter choices
about the context of the launch. This CL adds a bundle to
ActivityOptions that is sent to the Installer (if an Instant App is
launched) but not to any other application if something else on the
device handles the Intent instead.

Bug: 35180854
Test: manual
Change-Id: Ifc69a420a9c68041b39acd8a4b83db8a789822a6
2017-04-26 14:01:48 -07:00
TreeHugger Robot
b1fb0ecbd3 Merge "Update comment to getDataOnlyRemoteInputs per API review." 2017-04-26 19:34:59 +00:00
Shane Brennan
4bff5a1f5a Updating docs for RemoteInput non-textual inputs per API review request.
Test: Documentation-only change
Change-Id: I5987868916010f1143e2d8227ea3ea7952c87bc7
2017-04-26 12:32:24 -07:00
Felipe Leme
6551a50c3d Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev am: 5f7979222d
am: 58510a2d6b

Change-Id: I2850e33f2be4970aeac8ca1bd0f61703a73b18db
2017-04-26 19:05:13 +00:00
Makoto Onuki
cbc0d11d21 Enhance DeviceAdminService javadoc and remove TODO.
Test: Javadoc only
Bug: 37706621
Change-Id: Iac09675ca923adf40aef8f1871ddd0de797d4a08
2017-04-26 12:03:59 -07:00
Felipe Leme
5f7979222d Merge "Provide a way to set AutofillId on ViewStructure." into oc-dev 2017-04-26 18:38:21 +00:00
Amith Yamasani
86687827f3 Improve docs for AssistStructure#isHomeActivity
Change-Id: I84b5686c6d3d81f14dc56f72af985ffe686c0e0a
Fixes: 37558097
Test: make offline-sdk-docs
2017-04-26 11:35:15 -07:00
Tony Mak
eda0a9ae33 bindDeviceAdminService requires service to be proected by BIND_DEVICE_ADMIN
Test: cts-tradefed cts-dev --module DevicePolicyManager  --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest

Fix: 37624960

Change-Id: I0df88d2a019a0c5f8f997db1efede35a20441fa8
2017-04-26 14:00:33 +00:00
Makoto Onuki
13f215c04d Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev am: 781c8cb65e
am: 1ddaa67a59

Change-Id: Ice1a513a00e4b8962b11db6091f0bfe9e0f279f1
2017-04-26 00:54:07 +00:00
Jeff Sharkey
e00742f4c5 Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
am: db73950734

Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d
2017-04-26 00:41:04 +00:00
Seigo Nonaka
802c41bd11 Merge "Font provider cleaning ups." into oc-dev am: 5313eee98a
am: a3d5786a3d

Change-Id: Ic9a30e9bf8404c3a469bb0c998fd876ee94a3488
2017-04-26 00:39:15 +00:00
TreeHugger Robot
781c8cb65e Merge "DeviceAdminService must be protected with BIND_DEVICE_ADMIN." into oc-dev 2017-04-25 22:42:10 +00:00
Jeff Sharkey
a00c7c0a99 Merge "Fix some issues found by new doclava linter." into oc-dev 2017-04-25 22:11:01 +00:00
Felipe Leme
e4f30650ac Provide a way to set AutofillId on ViewStructure.
So far that was done indirectly by public methods that could
be overridden in away that does not set the proper id in the structure,
which would crash apps.

Bug: 36171235
Test: modified VirtualContainerActivityTest#testAutofillOverrideDispatchprovideAutofillStructure

Change-Id: I3f1c64020125cbb8349971a0bc52ccd1e0c81e62
2017-04-25 14:12:03 -07:00
Julia Reynolds
bad4297600 Api updates
- Better documentation on DEFAULT_CHANNEL_ID
- Renaming getChannel/setChannel/getTimeout/setTimeout
- Add documentation to getShortcutId
- @hide parcel constructors

Test: make, make cts
Bug: 37672218

Change-Id: I695b2620c51638a84930e9d1c5fbfd6d85699b55
2017-04-25 17:00:05 -04:00
Julia Reynolds
a047d8944b Merge "Allow some notifications in a group to be muted" into oc-dev am: 9685128edf
am: 5bc54aad76

Change-Id: If2ba099e67ccdabf756a62858a5244679f9c1547
2017-04-25 20:47:12 +00:00
Pavel Grafov
b8349c7f11 Merge "Fix javadoc to clearly express units and base for time value." into oc-dev am: 0a001ed37f
am: 31f94f28d2

Change-Id: I0943630bf90e473814f14d44701ecb109f514726
2017-04-25 20:42:42 +00:00
Makoto Onuki
fe73970116 DeviceAdminService must be protected with BIND_DEVICE_ADMIN.
Bug: 37625902
Bug: 36226832

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l DEBUG -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest
Change-Id: I0bee75d758b565c6587d0e9cabf63bec351a0669
2017-04-25 13:31:37 -07:00