Commit Graph

301953 Commits

Author SHA1 Message Date
Romain Guy
a247df0426 Merge "Pre-multiply gradient colors the right way" 2016-12-13 18:24:36 +00:00
Michal Karpinski
cb67dc9ead Fix javadoc for PackageManager#getNameForUid()
Change-Id: Ia4fbd6948ab0703c7df9dceae99170ffb8c96ddb
2016-12-13 18:20:23 +00:00
Esteban Talavera
6c9116a643 Create DISALLOW_{ADD,REMOVE}_MANAGED_PROFILE user restrictions
Bug: 31952368

Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest    frameworks-services
Test: runtest -c com.android.server.pm.UserManagerTest frameworks-services
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.UserRestrictionsTest

Change-Id: I240ab99c2409bbabffbc574bef202f2457026905
2016-12-13 18:14:19 +00:00
Ivan Podogov
be53bbba13 Merge changes from topic 'f-radio-toggle' into cw-f-dev am: e5592abb83 am: c5700918aa
am: 554f58a5bc

Change-Id: I1a3eb0610845d12ad51c3127fc1c4b302a740577
2016-12-13 18:12:06 +00:00
Svetoslav Ganov
30025afd2e Add WiFi toggle prompts - framework am: 82737b42a6 am: e07563cc96
am: ad096f8bab

Change-Id: I425323ef942f2133a65026edf7fb14bf9b980a2e
2016-12-13 18:11:10 +00:00
Svetoslav Ganov
a089700054 Add Bluetooth toggle prompts - framework am: b1e2da7c24 am: d23dc17754 -s ours
am: 9ec075a420

Change-Id: I7167c2f1bda4caa2d89c85ecbbe0f1602c9d04ce
2016-12-13 18:10:13 +00:00
Hakan Seyalioglu
7317e8abcc Don't auto-launch if switching to managed account
When the user picks the option to switch to a managed account, avoid
auto-launching the activity if there's only a single activity to pick
from.

Bug: 32669623

Test: Manual
Change-Id: Ieaed5885385929297304506ca2d5839e77043a64
2016-12-13 10:07:14 -08:00
jackqdyulei
089b6ac75a Change animation based on visibility of the drawable
Bug: 27633363
Test: make RunSettingsLibRoboTests
Change-Id: I589056eb95ee0af046e39d2a646b51c754886b4d
2016-12-13 10:04:17 -08:00
Ivan Podogov
554f58a5bc Merge changes from topic 'f-radio-toggle' into cw-f-dev am: e5592abb83
am: c5700918aa

Change-Id: I44f2d9b7b015f5b38023479ce0e0ae329b663b80
2016-12-13 17:58:20 +00:00
Svetoslav Ganov
ad096f8bab Add WiFi toggle prompts - framework am: 82737b42a6
am: e07563cc96

Change-Id: I033f5db461da6525f906f3d515bda3e322c13fb6
2016-12-13 17:57:29 +00:00
Svetoslav Ganov
9ec075a420 Add Bluetooth toggle prompts - framework am: b1e2da7c24
am: d23dc17754  -s ours

Change-Id: I04aebf2f5819bce363085482d0e52a06ecb624d8
2016-12-13 17:56:38 +00:00
Makoto Onuki
2d895c3efd ShortcutManager: direct pin shortcut support.
Test: Manual test and all the unit tests:
adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
... to test8

Bug 32908854

Change-Id: I11b81656959cccfb4efa83f08380b915e6eb84a6
2016-12-13 09:56:03 -08:00
Ivan Podogov
903d6414e5 resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp
Test: build police
Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b
2016-12-13 17:55:14 +00:00
TreeHugger Robot
61341618c5 Merge "Remove unnecessary dependency, and fix the chain" 2016-12-13 17:40:27 +00:00
Manu Cornet
f5def62226 Merge "Revert "Grid recents: tweak task header layout to better match mocks"" 2016-12-13 17:33:51 +00:00
Mike Reed
d43eaa9090 SkCanvas is no longer refcnted, use SkClipOps
Change-Id: I57469f56187f1ca8624e7a63968124ee925b4c04
2016-12-13 12:32:37 -05:00
Manu Cornet
c733803433 Revert "Grid recents: tweak task header layout to better match mocks"
This reverts commit 4701b99356.

Change-Id: Id1a2f93f55b32e6544083254bb16e3d3722aa3dd
2016-12-13 17:32:20 +00:00
Michal Karpinski
e3639a0a07 DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
Test: the APIs will be tested by CTS when unhidden
Bug: 29748723

(cherry picked from commit da9d3ad3ac)

Change-Id: Iaff05eb6d4a2fd12e0271c703d694ecfc0dc9a17
2016-12-13 17:25:49 +00:00
Michal Karpinski
0c4ec00f85 DO NOT MERGE Fix Lint errors for network logging API
Bug: 29748723

(cherry picked from commit 0879eb41ca)

Change-Id: I187aa5b96c283323edb6a1ebe5005d70e19bf563
2016-12-13 17:25:24 +00:00
Michal Karpinski
c4e7c32063 DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
Test: this only adds a log message
Bug: 29748723

(cherry picked from commit bcf1c58ec2)

Change-Id: Iad57528c60f35d4820a2f0196cccc92f7c4d3830
2016-12-13 17:24:55 +00:00
Michal Karpinski
504fa62f9e DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called
regardless of the amount of users

Bug: 32901196
Bug: 29748723
Change-Id: Ie419b5e496e23656cbe5436942d9aba402bfe68e
2016-12-13 17:24:17 +00:00
Michal Karpinski
5c64223da4 DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
We should disable those features before the DO is actually cleared.

Bug: 32901196
Bug: 29748723

(cherry picked from commit c44e679611)

Change-Id: I74679abc26753585f302f3d52bca81fe21e2e668
2016-12-13 17:23:42 +00:00
Michal Karpinski
896b9db8ed DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
Added a comment and renamed field to follow mConvention.

Test: will be CTS tested once APIs unhidden
Bug: 29748723

(cherry picked from commit aabe96db87)

Change-Id: I7ef118723d13ce1d313c3c56299c2dca2411eee6
2016-12-13 17:22:53 +00:00
Michal Karpinski
bbf352a2c1 DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve
the same batch many times

This allows DO to:
a) know that some logs were dropped (by trying with token and not
getting anything)
b) know how many logs were there in each batch (useful especially
for the dropped ones)
c) retry batch retrieval if it failed

Test: will be CTS tested once APIs unhidden
Bug: 29748723

(cherry picked from commit a9ff206af2)

Change-Id: Iac10e61cdf3b100719a9c029ff897bd5ef5c8e2f
2016-12-13 17:22:07 +00:00
Michal Karpinski
4c47adef60 DO NOT MERGE [DPM] Management and retrieval of network logs
This CL follows up on ag/1530343 and adds:
1) Various network events.
2) Retrieval method in DPM and APIs in DeviceAdminReceiver.
3) Extension of NetworkLogger and it's NetworkLoggingHandler.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Bug: 29748723
Change-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2
2016-12-13 17:19:22 +00:00
Michal Karpinski
c3abd34cfe DO NOT MERGE [DPM] DO can start network logging and listen for events
This CL adds:
1) Setter and getter in DPM to manipulate logging switch (retrieval
method to come in a subsequent CL(s)).
2) A way for DPM to register to listen for events.
3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).

Bug: 29748723
Change-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47
2016-12-13 17:15:38 +00:00
TreeHugger Robot
235117ac21 Merge "Grid recents: tweak task header layout to better match mocks" 2016-12-13 17:10:32 +00:00
Lenka Trochtova
35e91c055a Merge "Make UserManager#DISALLOW_OEM_UNLOCK a system API." 2016-12-13 17:05:02 +00:00
TreeHugger Robot
aa5f515b1a Merge "Extract checking profiles for restrictions into a shared method." 2016-12-13 16:48:17 +00:00
Andrei Stingaceanu
7c8ba07ed4 AutoSize TextView (part 4) - autosize when layout changes
Whenever TextView#onMeasure(...) gets called make sure to
also autosize is enabled. Also fixes the available space
calculation by taking the drawables padding into consideration
too.

Bug: 32221168
Bug: 33573642
Test: attached in topic
Change-Id: I1a01454f3863e51afd7e16cfa27f544db6ca0783
2016-12-13 16:44:59 +00:00
Jeremy Joslin
ee8fd8e452 Merge "Make the onRequestRecommendation() method async." am: fbeacb02c0 am: a6c6bc333d am: eb0a34f26b
am: 63c577c510  -s ours

Change-Id: I2ac19adab18e752207ab7bfb02bbfe0c0d0ccb53
2016-12-13 16:31:19 +00:00
skuhne@google.com
1b974dc979 Fixing timeout caused by non executed animation
The problem became apparent after a springboard activity
called another activity and a moveTaskToFront got requested.

This issue is similar to ag/1647538 where an
ExecuteAppTransision was missing and a timeout occured.

Bug: 33307856
Test: Start PlayStore on ARC++ several times to see that
it shows up immediately and not after a considerable delay.

Change-Id: I25b63bd65385a4ad45bbb1803ae92fb48fe5fe4d
(cherry picked from commit 06f78e83d1010fa5420c7fe88a0b27eb3651bdc3)
2016-12-13 16:27:35 +00:00
Jeremy Joslin
63c577c510 Merge "Make the onRequestRecommendation() method async." am: fbeacb02c0 am: a6c6bc333d
am: eb0a34f26b

Change-Id: I62200f11d6be2bf83350255d9902dc67cf1a908e
2016-12-13 16:25:44 +00:00
Jeremy Joslin
eb0a34f26b Merge "Make the onRequestRecommendation() method async." am: fbeacb02c0
am: a6c6bc333d

Change-Id: I56a830273f8e3246b598c2ea7a027b87e3066e16
2016-12-13 16:19:14 +00:00
Wyatt Riley
221bffe01b Merge "Restoring Network Available Notification to AGnssRil" 2016-12-13 16:14:50 +00:00
Jeremy Joslin
a6c6bc333d Merge "Make the onRequestRecommendation() method async."
am: fbeacb02c0

Change-Id: I9b98480499c2366eee06de163b561c4583e475d2
2016-12-13 16:13:44 +00:00
Treehugger Robot
fbeacb02c0 Merge "Make the onRequestRecommendation() method async." 2016-12-13 16:04:36 +00:00
Ivan Podogov
c5700918aa Merge changes from topic 'f-radio-toggle' into cw-f-dev
am: e5592abb83

Change-Id: I7b7052c0402a73bda44db5970f96b6d7226361fc
2016-12-13 16:02:45 +00:00
Svetoslav Ganov
e07563cc96 Add WiFi toggle prompts - framework
am: 82737b42a6

Change-Id: Ia8958b54d04fff971b96fc6d29771eb94fd9b17e
2016-12-13 16:02:23 +00:00
Svetoslav Ganov
d23dc17754 Add Bluetooth toggle prompts - framework
am: b1e2da7c24

Change-Id: I29c038d23488c504c838a85bd97c255b84919aab
2016-12-13 16:01:39 +00:00
Ivan Podogov
e5592abb83 Merge changes from topic 'f-radio-toggle' into cw-f-dev
* changes:
  Add WiFi toggle prompts - framework
  Add Bluetooth toggle prompts - framework
2016-12-13 15:55:30 +00:00
Manu Cornet
4701b99356 Grid recents: tweak task header layout to better match mocks
Test: Checked layout on local sw600dp device
Bug: 32101881
Change-Id: Ic205beea47fc67fca9b3c95b3d1318c156ccc9c1
2016-12-13 07:26:03 -08:00
TreeHugger Robot
e38cdde5af Merge "Cleanup log spam on system notification post." 2016-12-13 15:22:40 +00:00
Lenka Trochtova
5291ee732d DevicePolicyManager: make 3 hidden provisioning methods system API.
In order to unbundle OobConfig app, make the following
methods @SystemAPI:
- DevicePolicyManager#isDeviceProvisioned
- DevicePolicyManager#setDeviceProvisioningConfigApplied
- DevicePolicyManager#isDeviceProvisioningConfigApplied

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DevicePolicyManagerTest

Bug: 32972931

Change-Id: Ic33b6c570222e4aa31cf7975a39de0d9e2614534
2016-12-13 15:34:44 +01:00
Lenka Trochtova
12b0496944 Make UserManager#DISALLOW_OEM_UNLOCK a system API.
This is needed for unbundling of OobConfig app.

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerUserRestrictionTest#testDisallowOemUnlock_canSetWithSystemApi
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerUserRestrictionTest#testDisallowOemUnlock_doCannotSet

BUG: 32974379

Change-Id: I7710df96006821a5d0eddfe0b411dd3efa0e10f0
2016-12-13 15:10:38 +01:00
Tobias Thierer
29b639c089 Merge "API changes for updating Locale to OpenJDK8u60, part 2" am: c35137ce36 am: 7de23e292f am: cd6720274d
am: a5e128310e

Change-Id: I482b047e387c34487a031a4bb71d05799e31e621
2016-12-13 14:01:53 +00:00
Julia Reynolds
52e64d0162 Give assistant ability to modify channels.
Test: cts on same topic
Change-Id: Ia0db73d4d81a89e0821ba6a06f12823605dbea73
2016-12-13 14:00:01 +00:00
Julia Reynolds
19ad7477ce Cleanup log spam on system notification post.
Bug: 33209911
Test: unplug/replug adb cable, monitor log. runtest systemui-notifications
Change-Id: I294ccdcb0a353463fe0c6b52f1dbbd97f4c75079
2016-12-13 13:57:54 +00:00
Tobias Thierer
a5e128310e Merge "API changes for updating Locale to OpenJDK8u60, part 2" am: c35137ce36 am: 7de23e292f
am: cd6720274d

Change-Id: Ic39bbbdb2f15da406ad75dfa805d198b01f84581
2016-12-13 13:54:55 +00:00
Tobias Thierer
cd6720274d Merge "API changes for updating Locale to OpenJDK8u60, part 2" am: c35137ce36
am: 7de23e292f

Change-Id: Id25c5050bb798ec206e86a83260a3bee9510e52c
2016-12-13 13:48:39 +00:00