Commit Graph

11013 Commits

Author SHA1 Message Date
Winson Chung
3e16fdfe2a Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev am: a2f102b175
am: 0e71996f92

Change-Id: I9e98c2922365bd869c0d0e3f0a345a0c64e6879e
2017-04-28 02:01:07 +00:00
Winson Chung
a2f102b175 Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev 2017-04-28 00:58:23 +00:00
Winson Chung
90853251f3 Only sublist array by size or limit, whichever is smaller.
Bug: 37756537
Test: Set < 3 actions, ensure no crash...
Change-Id: I93a5ac78292fcdd870ebd897441c2cef0774d134
2017-04-27 17:38:21 -07:00
Adam Powell
738b69c235 Merge "Address API feedback for new fragment APIs" into oc-dev am: 13d03e504d
am: 3667b16a96

Change-Id: Idee18215f8441113186775813d12d01069ee45b0
2017-04-28 00:29:52 +00:00
Selim Cinek
e44061f9e7 Merge changes from topic 'music_extraction' into oc-dev
* 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-28 00:24:55 +00:00
Jorim Jaggi
a88bacba17 Merge "Implement API council feedback for dismissKeyguard" into oc-dev am: 560324cfa0
am: 74b6192f8b

Change-Id: I9238bfa834a71830b6361874524105973dc55fb6
2017-04-27 23:30:45 +00:00
Sudheer Shanka
0e229d0066 Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev am: 7e7f7d526d
am: 241674dedd

Change-Id: If9f1f1538c7c9c34057756fd221131d7cb430d9f
2017-04-27 23:26:48 +00:00
Selim Cinek
0847acd4d4 Implementing gradual image fade for the media template
Test: play music
Merged-In: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes: 36561228
2017-04-27 22:21:50 +00:00
Selim Cinek
5fb73f8629 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
Merged-In: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
2017-04-27 22:21:17 +00:00
TreeHugger Robot
13d03e504d Merge "Address API feedback for new fragment APIs" into oc-dev 2017-04-27 22:18:11 +00:00
Lucas Dupin
97985d8453 Merge "Wallpaper color extraction" 2017-04-27 22:08:19 +00:00
TreeHugger Robot
a851b5ae76 Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev 2017-04-27 21:44:56 +00:00
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
Jorim Jaggi
560324cfa0 Merge "Implement API council feedback for dismissKeyguard" into oc-dev 2017-04-27 20:57:11 +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
Sudheer Shanka
7e7f7d526d Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev 2017-04-27 20:47:09 +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
Adam Powell
10d69ac250 Address API feedback for new fragment APIs
Framework edition

Bug: 37637473
Bug: 37636731
Bug: 37638276

Test: run fragment tests
Change-Id: I3e77ab51d60f5a550d60701fc81a84e143a53244
2017-04-27 12:35:15 -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
Jorim Jaggi
f41e7664a2 Implement API council feedback for dismissKeyguard
Test: KeyguardLockedTests CTS
Change-Id: Ibc6923ebe8363644e9b52b2b53b45d918124f52d
Fixes: 37673408
2017-04-27 17:58:59 +02: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
Sudheer Shanka
34217511bc Rename ActivityMonitor.onMatchIntent to onStartActivity.
Fixes: 37672383
Test: cts-tradefed run singleCommand cts-dev --module CtsAppTestCases -t \
      android.app.cts.Instrumentation_ActivityMonitorTest

Change-Id: Ic3fdba576232f0a05454dde8ea482ea714aeee3d
2017-04-26 14:52:56 -07: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